1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 10:19:33 +02:00

code simplification

This commit is contained in:
Nikolay Pultsin 2014-12-27 06:50:31 +00:00
parent 6ea54edf5f
commit 9d02e1bafd
5 changed files with 26 additions and 34 deletions

View file

@ -22,7 +22,6 @@ package org.geometerplus.android.fbreader.network;
import java.util.List;
import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.net.Uri;
@ -80,7 +79,7 @@ public abstract class Util implements UserRegistrationConstants {
});
}
static Intent authorisationIntent(INetworkLink link, Uri id) {
public static Intent authorisationIntent(INetworkLink link, Uri id) {
final Intent intent = new Intent(AUTHORISATION_ACTION, id);
intent.putExtra(CATALOG_URL, link.getUrl(UrlInfo.Type.Catalog));
intent.putExtra(SIGNIN_URL, link.getUrl(UrlInfo.Type.SignIn));
@ -89,24 +88,6 @@ public abstract class Util implements UserRegistrationConstants {
return intent;
}
private static Intent registrationIntent(INetworkLink link) {
return authorisationIntent(link, Uri.parse(link.getUrl(UrlInfo.Type.Catalog) + "/register"));
}
public static boolean isRegistrationSupported(Activity activity, INetworkLink link) {
return PackageUtil.canBeStarted(activity, registrationIntent(link), true);
}
public static void runRegistrationDialog(Activity activity, INetworkLink link) {
try {
final Intent intent = registrationIntent(link);
if (PackageUtil.canBeStarted(activity, intent, true)) {
activity.startActivity(intent);
}
} catch (ActivityNotFoundException e) {
}
}
public static void runAuthenticationDialog(Activity activity, INetworkLink link, Runnable onSuccess) {
final NetworkAuthenticationManager mgr = link.authenticationManager();