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

AutoSignIn dialog implementation

Browse source
This commit is contained in:
Vasiliy Bout 2011-08-29 22:28:09 +04:00
parent 886fb90d5c
commit 53f5438509
6 changed files with 52 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
View file

@ -403,6 +403,9 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary.
case NetworkLibraryActivity.SIGNUP_CODE: case NetworkLibraryActivity.SIGNUP_CODE:
Util.processSignup(myBook.Link, resultCode, data); Util.processSignup(myBook.Link, resultCode, data);
break; break;
case NetworkLibraryActivity.AUTO_SIGNIN_CODE:
Util.processAutoSignIn(this, myBook.Link, resultCode, data);
break;
} }
} }
} }

4
src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
View file

@ -41,6 +41,7 @@ import org.geometerplus.android.fbreader.network.action.*;
public class NetworkLibraryActivity extends BaseActivity implements NetworkLibrary.ChangeListener { public class NetworkLibraryActivity extends BaseActivity implements NetworkLibrary.ChangeListener {
protected static final int BASIC_AUTHENTICATION_CODE = 1; protected static final int BASIC_AUTHENTICATION_CODE = 1;
protected static final int SIGNUP_CODE = 2; protected static final int SIGNUP_CODE = 2;
protected static final int AUTO_SIGNIN_CODE = 3;
BookDownloaderServiceConnection Connection; BookDownloaderServiceConnection Connection;
@ -268,6 +269,9 @@ public class NetworkLibraryActivity extends BaseActivity implements NetworkLibra
case SIGNUP_CODE: case SIGNUP_CODE:
Util.processSignup(((NetworkCatalogTree)getCurrentTree()).Item.Link, resultCode, intent); Util.processSignup(((NetworkCatalogTree)getCurrentTree()).Item.Link, resultCode, intent);
break; break;
case AUTO_SIGNIN_CODE:
Util.processAutoSignIn(this, ((NetworkCatalogTree)getCurrentTree()).Item.Link, resultCode, intent);
break;
} }
} }

45
src/org/geometerplus/android/fbreader/network/Util.java
View file

@ -38,8 +38,8 @@ import org.geometerplus.android.util.PackageUtil;
public abstract class Util implements UserRegistrationConstants { public abstract class Util implements UserRegistrationConstants {
private static final String REGISTRATION_ACTION = private static final String REGISTRATION_ACTION =
"android.fbreader.action.NETWORK_LIBRARY_REGISTER"; "android.fbreader.action.NETWORK_LIBRARY_REGISTER";
private static final String AUTOREGISTRATION_ACTION = private static final String AUTO_SIGNIN_ACTION =
"android.fbreader.action.NETWORK_LIBRARY_AUTOREGISTER"; "android.fbreader.action.NETWORK_LIBRARY_AUTOSIGNIN";
static INetworkLink linkByIntent(Intent intent) { static INetworkLink linkByIntent(Intent intent) {
return NetworkLibrary.Instance().getLinkByUrl(intent.getData().toString()); return NetworkLibrary.Instance().getLinkByUrl(intent.getData().toString());
@ -61,10 +61,10 @@ public abstract class Util implements UserRegistrationConstants {
); );
} }
public static boolean isAutoregistrationSupported(Activity activity, INetworkLink link) { public static boolean isAutoSignInSupported(Activity activity, INetworkLink link) {
return testService( return testService(
activity, activity,
AUTOREGISTRATION_ACTION, AUTO_SIGNIN_ACTION,
link.getUrl(UrlInfo.Type.SignUp) link.getUrl(UrlInfo.Type.SignUp)
); );
} }
@ -82,14 +82,14 @@ public abstract class Util implements UserRegistrationConstants {
} }
} }
public static void runAutoregistrationDialog(Activity activity, INetworkLink link) { public static void runAutoSignInDialog(Activity activity, INetworkLink link) {
try { try {
final Intent intent = new Intent( final Intent intent = new Intent(
AUTOREGISTRATION_ACTION, AUTO_SIGNIN_ACTION,
Uri.parse(link.getUrl(UrlInfo.Type.SignUp)) Uri.parse(link.getUrl(UrlInfo.Type.SignIn))
); );
if (PackageUtil.canBeStarted(activity, intent, true)) { if (PackageUtil.canBeStarted(activity, intent, true)) {
activity.startActivityForResult(intent, NetworkLibraryActivity.SIGNUP_CODE); activity.startActivityForResult(intent, NetworkLibraryActivity.AUTO_SIGNIN_CODE);
} }
} catch (ActivityNotFoundException e) { } catch (ActivityNotFoundException e) {
} }
@ -133,6 +133,35 @@ public abstract class Util implements UserRegistrationConstants {
} }
} }
public static void processAutoSignIn(Activity activity, INetworkLink link, int resultCode, Intent data) {
if (resultCode == Activity.RESULT_OK && data != null) {
try {
final NetworkAuthenticationManager mgr = link.authenticationManager();
if (mgr instanceof LitResAuthenticationManager) {
((LitResAuthenticationManager)mgr).initUser(
data.getStringExtra(USER_REGISTRATION_USERNAME),
data.getStringExtra(USER_REGISTRATION_LITRES_SID),
"",
false
);
}
if (!mgr.isAuthorised(true)) {
throw new ZLNetworkException(NetworkException.ERROR_AUTHENTICATION_FAILED);
}
try {
mgr.initialize();
} catch (ZLNetworkException e) {
mgr.logOut();
throw e;
}
// TODO: implement postRunnable (e.g. buying book on "quick buy")
} catch (ZLNetworkException e) {
// TODO: show an error message
}
}
}
public static void openInBrowser(Context context, String url) { public static void openInBrowser(Context context, String url) {
if (url != null) { if (url != null) {
url = NetworkLibrary.Instance().rewriteUrl(url, true); url = NetworkLibrary.Instance().rewriteUrl(url, true);

11
src/org/geometerplus/android/fbreader/network/action/NetworkBookActions.java
View file

@ -381,15 +381,15 @@ public abstract class NetworkBookActions {
} else { } else {
final String signInKey = "signIn"; final String signInKey = "signIn";
final String registerKey = "signUp"; final String registerKey = "signUp";
final String autoregisterKey = "quickBuy"; final String quickBuyKey = "quickBuy";
final ArrayList<String> items = new ArrayList<String>(); final ArrayList<String> items = new ArrayList<String>();
items.add(signInKey); items.add(signInKey);
if (Util.isRegistrationSupported(activity, book.Link)) { if (Util.isRegistrationSupported(activity, book.Link)) {
items.add(registerKey); items.add(registerKey);
} }
if (Util.isAutoregistrationSupported(activity, book.Link)) { if (Util.isAutoSignInSupported(activity, book.Link)) {
items.add(autoregisterKey); items.add(quickBuyKey);
} }
if (items.size() > 1) { if (items.size() > 1) {
@ -415,12 +415,13 @@ public abstract class NetworkBookActions {
} else if (registerKey.equals(item)) { } else if (registerKey.equals(item)) {
Util.runRegistrationDialog(activity, book.Link); Util.runRegistrationDialog(activity, book.Link);
// TODO: buy on success // TODO: buy on success
} else if (autoregisterKey.equals(item)) { } else if (quickBuyKey.equals(item)) {
Util.runAutoregistrationDialog(activity, book.Link); Util.runAutoSignInDialog(activity, book.Link);
// TODO: buy on success // TODO: buy on success
} }
} }
}) })
.setNegativeButton(buttonResource.getResource("cancel").getValue(), null)
.create().show(); .create().show();
} else { } else {
Util.runAuthenticationDialog(activity, book.Link, new Runnable() { Util.runAuthenticationDialog(activity, book.Link, new Runnable() {

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

@ -35,10 +35,6 @@ class LitResAuthenticationXMLReader extends ZLXMLReaderAdapter {
myException = e; myException = e;
} }
protected void setErrorMessage(String errorMessage) {
myException = new ZLNetworkException(true, errorMessage);
}
public ZLNetworkException getException() { public ZLNetworkException getException() {
return myException; return myException;
} }

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

@ -22,8 +22,6 @@ package org.geometerplus.fbreader.network.authentication.litres;
import org.geometerplus.zlibrary.core.xml.ZLStringMap; import org.geometerplus.zlibrary.core.xml.ZLStringMap;
import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.fbreader.network.NetworkException;
class LitResLoginXMLReader extends LitResAuthenticationXMLReader { class LitResLoginXMLReader extends LitResAuthenticationXMLReader {
private static final String TAG_AUTHORIZATION_OK = "catalit-authorization-ok"; private static final String TAG_AUTHORIZATION_OK = "catalit-authorization-ok";
private static final String TAG_AUTHORIZATION_FAILED = "catalit-authorization-failed"; private static final String TAG_AUTHORIZATION_FAILED = "catalit-authorization-failed";
@ -42,7 +40,7 @@ class LitResLoginXMLReader extends LitResAuthenticationXMLReader {
public boolean startElementHandler(String tag, ZLStringMap attributes) { public boolean startElementHandler(String tag, ZLStringMap attributes) {
tag = tag.toLowerCase().intern(); tag = tag.toLowerCase().intern();
if (TAG_AUTHORIZATION_FAILED == tag) { if (TAG_AUTHORIZATION_FAILED == tag) {
setException(new ZLNetworkException(NetworkException.ERROR_AUTHENTICATION_FAILED)); setException(new ZLNetworkException(ZLNetworkException.ERROR_AUTHENTICATION_FAILED));
} else if (TAG_AUTHORIZATION_OK == tag) { } else if (TAG_AUTHORIZATION_OK == tag) {
FirstName = attributes.getValue("first-name"); FirstName = attributes.getValue("first-name");
LastName = attributes.getValue("first-name"); LastName = attributes.getValue("first-name");
@ -54,7 +52,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(new ZLNetworkException(NetworkException.ERROR_SOMETHING_WRONG, HostName)); setException(new ZLNetworkException(ZLNetworkException.ERROR_SOMETHING_WRONG, HostName));
} }
return true; return true;
} }