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

Merge branch 'master' into lr

Browse source 
Conflicts:
	src/org/geometerplus/android/fbreader/network/Util.java
	src/org/geometerplus/android/fbreader/network/action/SignUpAction.java
This commit is contained in:
Nikolay Pultsin 2014-12-27 06:54:35 +00:00
commit 65848eb552
2 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,6 @@ package org.geometerplus.android.fbreader.network;
import java.util.List; import java.util.List;
import android.app.Activity; import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
@ -38,8 +37,6 @@ import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
import org.geometerplus.android.util.UIUtil; import org.geometerplus.android.util.UIUtil;
import org.geometerplus.android.util.PackageUtil; import org.geometerplus.android.util.PackageUtil;
import org.geometerplus.android.fbreader.network.litres.UserRegistrationActivity;
public abstract class Util implements UserRegistrationConstants { public abstract class Util implements UserRegistrationConstants {
static final String AUTHORISATION_ACTION = "android.fbreader.action.network.AUTHORISATION"; static final String AUTHORISATION_ACTION = "android.fbreader.action.network.AUTHORISATION";
static final String SIGNIN_ACTION = "android.fbreader.action.network.SIGNIN"; static final String SIGNIN_ACTION = "android.fbreader.action.network.SIGNIN";
@ -91,20 +88,6 @@ public abstract class Util implements UserRegistrationConstants {
return intent; return intent;
} }
public static boolean isRegistrationSupported(INetworkLink link) {
return "litres.ru".equals(link.getHostName());
}
public static void runRegistrationDialog(Activity activity, INetworkLink link) {
if (isRegistrationSupported(link)) {
try {
final Intent intent = authorisationIntent(link, activity, UserRegistrationActivity.class);
activity.startActivity(intent);
} catch (ActivityNotFoundException e) {
}
}
}
public static void runAuthenticationDialog(Activity activity, INetworkLink link, Runnable onSuccess) { public static void runAuthenticationDialog(Activity activity, INetworkLink link, Runnable onSuccess) {
final NetworkAuthenticationManager mgr = link.authenticationManager(); final NetworkAuthenticationManager mgr = link.authenticationManager();

22
src/org/geometerplus/android/fbreader/network/action/SignUpAction.java
View file

@ -20,13 +20,17 @@
package org.geometerplus.android.fbreader.network.action; package org.geometerplus.android.fbreader.network.action;
import android.app.Activity; import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.net.Uri;
import org.geometerplus.fbreader.network.INetworkLink; import org.geometerplus.fbreader.network.INetworkLink;
import org.geometerplus.fbreader.network.NetworkTree; import org.geometerplus.fbreader.network.NetworkTree;
import org.geometerplus.fbreader.network.tree.NetworkCatalogRootTree;
import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager; import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
import org.geometerplus.fbreader.network.tree.NetworkCatalogRootTree;
import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
import org.geometerplus.android.fbreader.network.Util; import org.geometerplus.android.fbreader.network.Util;
import org.geometerplus.android.fbreader.network.litres.UserRegistrationActivity;
public class SignUpAction extends Action { public class SignUpAction extends Action {
public SignUpAction(Activity activity) { public SignUpAction(Activity activity) {
@ -39,16 +43,18 @@ public class SignUpAction extends Action {
return false; return false;
} }
final INetworkLink link = tree.getLink(); final NetworkAuthenticationManager mgr = tree.getLink().authenticationManager();
final NetworkAuthenticationManager mgr = link.authenticationManager(); return mgr != null && !mgr.mayBeAuthorised(false);
return
mgr != null &&
!mgr.mayBeAuthorised(false) &&
Util.isRegistrationSupported(link);
} }
@Override @Override
public void run(NetworkTree tree) { public void run(NetworkTree tree) {
Util.runRegistrationDialog(myActivity, tree.getLink()); final INetworkLink link = tree.getLink();
try {
myActivity.startActivity(Util.authorisationIntent(
link, myActivity, UserRegistrationActivity.class
));
} catch (ActivityNotFoundException e) {
}
} }
} }