yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 12:00:17 +02:00
Code Issues Releases Wiki Activity

host name constant in litres code

Browse source
This commit is contained in:
Nikolay Pultsin 2014-10-28 19:49:22 +02:00
parent ee06eaa579
commit c773e35d98
7 changed files with 16 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationManager.java
View file

@ -79,9 +79,9 @@ public class LitResAuthenticationManager extends NetworkAuthenticationManager {
public LitResAuthenticationManager(OPDSNetworkLink link) { public LitResAuthenticationManager(OPDSNetworkLink link) {
super(link); super(link);
mySidOption = new ZLStringOption(link.getSiteName(), "sid", ""); mySidOption = new ZLStringOption(LitResUtil.HOST_NAME, "sid", "");
myUserIdOption = new ZLStringOption(link.getSiteName(), "userId", ""); myUserIdOption = new ZLStringOption(LitResUtil.HOST_NAME, "userId", "");
myCanRebillOption = new ZLBooleanOption(link.getSiteName(), "canRebill", false); myCanRebillOption = new ZLBooleanOption(LitResUtil.HOST_NAME, "canRebill", false);
} }
public synchronized boolean initUser(String username, String sid, String userId, boolean canRebill) { public synchronized boolean initUser(String username, String sid, String userId, boolean canRebill) {
@ -149,7 +149,7 @@ public class LitResAuthenticationManager extends NetworkAuthenticationManager {
} }
try { try {
final LitResLoginXMLReader xmlReader = new LitResLoginXMLReader(Link.getSiteName()); final LitResLoginXMLReader xmlReader = new LitResLoginXMLReader();
final Map<String,String> params = new HashMap<String,String>(); final Map<String,String> params = new HashMap<String,String>();
final String url = parseUrl(Link.getUrl(UrlInfo.Type.SignIn), params); final String url = parseUrl(Link.getUrl(UrlInfo.Type.SignIn), params);
if (url == null) { if (url == null) {
@ -183,7 +183,7 @@ public class LitResAuthenticationManager extends NetworkAuthenticationManager {
} }
try { try {
final LitResLoginXMLReader xmlReader = new LitResLoginXMLReader(Link.getSiteName()); final LitResLoginXMLReader xmlReader = new LitResLoginXMLReader();
final LitResNetworkRequest request = new LitResNetworkRequest(url, xmlReader); final LitResNetworkRequest request = new LitResNetworkRequest(url, xmlReader);
for (Map.Entry<String,String> entry : params.entrySet()) { for (Map.Entry<String,String> entry : params.entrySet()) {
request.addPostParameter(entry.getKey(), entry.getValue()); request.addPostParameter(entry.getKey(), entry.getValue());
@ -236,7 +236,7 @@ public class LitResAuthenticationManager extends NetworkAuthenticationManager {
throw ZLNetworkException.forCode(NetworkException.ERROR_BOOK_NOT_PURCHASED); // TODO: more correct error message??? throw ZLNetworkException.forCode(NetworkException.ERROR_BOOK_NOT_PURCHASED); // TODO: more correct error message???
} }
final LitResPurchaseXMLReader xmlReader = new LitResPurchaseXMLReader(Link.getSiteName()); final LitResPurchaseXMLReader xmlReader = new LitResPurchaseXMLReader();
ZLNetworkException exception = null; ZLNetworkException exception = null;
try { try {
@ -260,7 +260,7 @@ public class LitResAuthenticationManager extends NetworkAuthenticationManager {
throw exception; throw exception;
} }
if (xmlReader.BookId == null || !xmlReader.BookId.equals(book.Id)) { if (xmlReader.BookId == null || !xmlReader.BookId.equals(book.Id)) {
throw ZLNetworkException.forCode(NetworkException.ERROR_SOMETHING_WRONG, Link.getSiteName()); throw ZLNetworkException.forCode(NetworkException.ERROR_SOMETHING_WRONG, LitResUtil.HOST_NAME);
} }
myPurchasedBooks.addToStart(book); myPurchasedBooks.addToStart(book);
final BasketItem basket = book.Link.getBasketItem(); final BasketItem basket = book.Link.getBasketItem();
@ -441,7 +441,7 @@ public class LitResAuthenticationManager extends NetworkAuthenticationManager {
final LitResNetworkRequest request = new LitResNetworkRequest( final LitResNetworkRequest request = new LitResNetworkRequest(
LitResUtil.url(Link, query), LitResUtil.url(Link, query),
new LitResPurchaseXMLReader(Link.getSiteName()) new LitResPurchaseXMLReader()
); );
request.addPostParameter("sid", sid); request.addPostParameter("sid", sid);
request.addPostParameter("art", "0"); request.addPostParameter("art", "0");
@ -459,7 +459,7 @@ public class LitResAuthenticationManager extends NetworkAuthenticationManager {
if (url == null) { if (url == null) {
throw ZLNetworkException.forCode(NetworkException.ERROR_UNSUPPORTED_OPERATION); throw ZLNetworkException.forCode(NetworkException.ERROR_UNSUPPORTED_OPERATION);
} }
final LitResPasswordRecoveryXMLReader xmlReader = new LitResPasswordRecoveryXMLReader(Link.getSiteName()); final LitResPasswordRecoveryXMLReader xmlReader = new LitResPasswordRecoveryXMLReader();
final LitResNetworkRequest request = new LitResNetworkRequest(url, xmlReader); final LitResNetworkRequest request = new LitResNetworkRequest(url, xmlReader);
request.addPostParameter("mail", email); request.addPostParameter("mail", email);
myNetworkContext.perform(request); myNetworkContext.perform(request);

6
src/org/geometerplus/fbreader/network/authentication/litres/LitResAuthenticationXMLReader.java
View file

@ -23,12 +23,6 @@ import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter;
import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.zlibrary.core.network.ZLNetworkException;
class LitResAuthenticationXMLReader extends ZLXMLReaderAdapter { class LitResAuthenticationXMLReader extends ZLXMLReaderAdapter {
public final String HostName;
public LitResAuthenticationXMLReader(String hostName) {
HostName = hostName;
}
private ZLNetworkException myException; private ZLNetworkException myException;
protected void setException(ZLNetworkException e) { protected void setException(ZLNetworkException e) {

6
src/org/geometerplus/fbreader/network/authentication/litres/LitResLoginXMLReader.java
View file

@ -33,10 +33,6 @@ class LitResLoginXMLReader extends LitResAuthenticationXMLReader {
public String Sid; public String Sid;
public boolean CanRebill; public boolean CanRebill;
public LitResLoginXMLReader(String hostName) {
super(hostName);
}
@Override @Override
public boolean startElementHandler(String tag, ZLStringMap attributes) { public boolean startElementHandler(String tag, ZLStringMap attributes) {
tag = tag.toLowerCase().intern(); tag = tag.toLowerCase().intern();
@ -53,7 +49,7 @@ class LitResLoginXMLReader extends LitResAuthenticationXMLReader {
} }
CanRebill = stringCanRebill != null && !"0".equals(stringCanRebill) && !"no".equalsIgnoreCase(stringCanRebill); CanRebill = stringCanRebill != null && !"0".equals(stringCanRebill) && !"no".equalsIgnoreCase(stringCanRebill);
} else { } else {
setException(ZLNetworkException.forCode(ZLNetworkException.ERROR_SOMETHING_WRONG, HostName)); setException(ZLNetworkException.forCode(ZLNetworkException.ERROR_SOMETHING_WRONG, LitResUtil.HOST_NAME));
} }
return true; return true;
} }

6
src/org/geometerplus/fbreader/network/authentication/litres/LitResPasswordRecoveryXMLReader.java
View file

@ -28,10 +28,6 @@ class LitResPasswordRecoveryXMLReader extends LitResAuthenticationXMLReader {
private static final String TAG_PASSWORD_RECOVERY_OK = "catalit-pass-recover-ok"; private static final String TAG_PASSWORD_RECOVERY_OK = "catalit-pass-recover-ok";
private static final String TAG_PASSWORD_RECOVERY_FAILED = "catalit-pass-recover-failed"; private static final String TAG_PASSWORD_RECOVERY_FAILED = "catalit-pass-recover-failed";
public LitResPasswordRecoveryXMLReader(String hostName) {
super(hostName);
}
@Override @Override
public boolean startElementHandler(String tag, ZLStringMap attributes) { public boolean startElementHandler(String tag, ZLStringMap attributes) {
tag = tag.toLowerCase().intern(); tag = tag.toLowerCase().intern();
@ -47,7 +43,7 @@ class LitResPasswordRecoveryXMLReader extends LitResAuthenticationXMLReader {
} else if (TAG_PASSWORD_RECOVERY_OK == tag) { } else if (TAG_PASSWORD_RECOVERY_OK == tag) {
// NOP // NOP
} else { } else {
setException(ZLNetworkException.forCode(NetworkException.ERROR_SOMETHING_WRONG, HostName)); setException(ZLNetworkException.forCode(NetworkException.ERROR_SOMETHING_WRONG, LitResUtil.HOST_NAME));
} }
return true; return true;
} }

6
src/org/geometerplus/fbreader/network/authentication/litres/LitResPurchaseXMLReader.java
View file

@ -34,10 +34,6 @@ class LitResPurchaseXMLReader extends LitResAuthenticationXMLReader {
public String Account; public String Account;
public String BookId; public String BookId;
public LitResPurchaseXMLReader(String hostName) {
super(hostName);
}
@Override @Override
public boolean startElementHandler(String tag, ZLStringMap attributes) { public boolean startElementHandler(String tag, ZLStringMap attributes) {
tag = tag.toLowerCase().intern(); tag = tag.toLowerCase().intern();
@ -60,7 +56,7 @@ class LitResPurchaseXMLReader extends LitResAuthenticationXMLReader {
setException(ZLNetworkException.forCode(NetworkException.ERROR_INTERNAL)); setException(ZLNetworkException.forCode(NetworkException.ERROR_INTERNAL));
} }
} else { } else {
setException(ZLNetworkException.forCode(NetworkException.ERROR_SOMETHING_WRONG, HostName)); setException(ZLNetworkException.forCode(NetworkException.ERROR_SOMETHING_WRONG, LitResUtil.HOST_NAME));
} }
} }
return true; return true;

8
src/org/geometerplus/fbreader/network/authentication/litres/LitResUtil.java
View file

@ -25,16 +25,16 @@ import org.geometerplus.fbreader.network.INetworkLink;
class LitResUtil { class LitResUtil {
public static final String HOST_NAME = "litres.ru";
public static String url(String path) { public static String url(String path) {
String url = "://robot.litres.ru/" + path; final String url = "://robot.litres.ru/" + path;
if (ZLNetworkUtil.hasParameter(url, "sid") || if (ZLNetworkUtil.hasParameter(url, "sid") ||
ZLNetworkUtil.hasParameter(url, "pwd")) { ZLNetworkUtil.hasParameter(url, "pwd")) {
url = "https" + url; return "https" + url;
} else { } else {
url = "http" + url; return "http" + url;
} }
return url;
} }
public static String url(INetworkLink link, String path) { public static String url(INetworkLink link, String path) {

1
src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java
View file

@ -55,7 +55,6 @@ class LitResXMLReader extends LitResAuthenticationXMLReader {
private LinkedList<String> myTags = new LinkedList<String>(); private LinkedList<String> myTags = new LinkedList<String>();
public LitResXMLReader(OPDSNetworkLink link) { public LitResXMLReader(OPDSNetworkLink link) {
super(link.getSiteName());
Link = link; Link = link;
} }