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

code simplification

Browse source
This commit is contained in:
Nikolay Pultsin 2011-10-03 00:08:08 +01:00
parent a53ed813fb
commit 319fe52aa4
3 changed files with 45 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,8 +73,7 @@ public class AccountMenuActivity extends MenuActivity {
if (info.getId().toString().endsWith("/signIn")) { if (info.getId().toString().endsWith("/signIn")) {
Util.runAuthenticationDialog(AccountMenuActivity.this, myLink, null); Util.runAuthenticationDialog(AccountMenuActivity.this, myLink, null);
} else { } else {
final Intent intent = new Intent(getAction(), info.getId()); final Intent intent = Util.authorizationIntent(myLink, info.getId());
Util.addAuthorizationData(intent, myLink);
if (PackageUtil.canBeStarted(AccountMenuActivity.this, intent, true)) { if (PackageUtil.canBeStarted(AccountMenuActivity.this, intent, true)) {
startActivity(intent); startActivity(intent);
} }

38
src/org/geometerplus/android/fbreader/network/ListenerCallback.java
View file

@ -23,23 +23,51 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import org.geometerplus.fbreader.network.INetworkLink; import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.fbreader.network.NetworkLibrary;
public class ListenerCallback extends BroadcastReceiver { import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
import org.geometerplus.fbreader.network.authentication.litres.LitResAuthenticationManager;
public class ListenerCallback extends BroadcastReceiver implements UserRegistrationConstants {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
final NetworkLibrary library = NetworkLibrary.Instance(); final NetworkLibrary library = NetworkLibrary.Instance();
if ("android.fbreader.action.network.SIGNIN".equals(intent.getAction())) { if ("android.fbreader.action.network.SIGNIN".equals(intent.getAction())) {
final String url = intent.getStringExtra(UserRegistrationConstants.CATALOG_URL); final String url = intent.getStringExtra(CATALOG_URL);
final INetworkLink link = library.getLinkByUrl(url); final INetworkLink link = library.getLinkByUrl(url);
if (link != null) { if (link != null) {
Util.processSignup(link, android.app.Activity.RESULT_OK, intent); processSignup(link, intent);
} }
library.fireModelChangedEvent(NetworkLibrary.ChangeListener.Code.SignedIn); library.fireModelChangedEvent(NetworkLibrary.ChangeListener.Code.SignedIn);
} else { } else {
library.fireModelChangedEvent(NetworkLibrary.ChangeListener.Code.SomeCode); library.fireModelChangedEvent(NetworkLibrary.ChangeListener.Code.SomeCode);
} }
} }
private static void processSignup(INetworkLink link, Intent data) {
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;
}
} catch (ZLNetworkException e) {
// TODO: show an error message
}
}
} }

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

@ -30,7 +30,6 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.fbreader.network.*; import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager; import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
import org.geometerplus.fbreader.network.authentication.litres.LitResAuthenticationManager;
import org.geometerplus.fbreader.network.urlInfo.UrlInfo; import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
import org.geometerplus.fbreader.network.urlInfo.BookUrlInfo; import org.geometerplus.fbreader.network.urlInfo.BookUrlInfo;
@ -64,31 +63,24 @@ public abstract class Util implements UserRegistrationConstants {
}, activity); }, activity);
} }
private static boolean testService(Activity activity, String action, String url) { static Intent authorizationIntent(INetworkLink link, Uri id) {
return url != null && PackageUtil.canBeStarted(activity, new Intent(action, Uri.parse(url)), true); final Intent intent = new Intent(AUTHORIZATION_ACTION, id);
intent.putExtra(CATALOG_URL, link.getUrl(UrlInfo.Type.Catalog));
intent.putExtra(SIGNUP_URL, link.getUrl(UrlInfo.Type.SignUp));
return intent;
}
private static Intent registrationIntent(INetworkLink link) {
return authorizationIntent(link, Uri.parse(link.getUrl(UrlInfo.Type.Catalog) + "/register"));
} }
public static boolean isRegistrationSupported(Activity activity, INetworkLink link) { public static boolean isRegistrationSupported(Activity activity, INetworkLink link) {
return testService( return PackageUtil.canBeStarted(activity, registrationIntent(link), true);
activity,
AUTHORIZATION_ACTION,
link.getUrl(UrlInfo.Type.Catalog) + "/register"
);
}
static void addAuthorizationData(Intent intent, INetworkLink link) {
intent.putExtra(CATALOG_URL, link.getUrl(UrlInfo.Type.Catalog));
intent.putExtra(SIGNUP_URL, link.getUrl(UrlInfo.Type.SignUp));
} }
public static void runRegistrationDialog(Activity activity, INetworkLink link) { public static void runRegistrationDialog(Activity activity, INetworkLink link) {
try { try {
final NetworkAuthenticationManager mgr = link.authenticationManager(); final Intent intent = registrationIntent(link);
final Intent intent = new Intent(
AUTHORIZATION_ACTION,
Uri.parse(link.getUrl(UrlInfo.Type.Catalog) + "/register")
);
addAuthorizationData(intent, link);
if (PackageUtil.canBeStarted(activity, intent, true)) { if (PackageUtil.canBeStarted(activity, intent, true)) {
activity.startActivity(intent); activity.startActivity(intent);
} }
@ -107,61 +99,6 @@ public abstract class Util implements UserRegistrationConstants {
activity.startActivity(intent); activity.startActivity(intent);
} }
static void processSignup(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;
}
} catch (ZLNetworkException e) {
// TODO: show an error message
}
}
}
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(Activity activity, String url) { public static void openInBrowser(Activity activity, String url) {
if (url != null) { if (url != null) {
url = NetworkLibrary.Instance().rewriteUrl(url, true); url = NetworkLibrary.Instance().rewriteUrl(url, true);