aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Kwon <will@kwon.co>2016-04-28 20:54:00 -0700
committerWill Kwon <will@kwon.co>2016-04-28 20:54:00 -0700
commit7a23bbdfdd7c4511fecdeb7847f1d2e5eb4d5a20 (patch)
tree8b625548e7538664c5580d80ee8c2b9feda55173
parentc3be68920da8b994b1471fdaa8a05c10a64d136f (diff)
downloadgradle-perf-android-medium-7a23bbdfdd7c4511fecdeb7847f1d2e5eb4d5a20.tar.gz
Even if Google Play is available, return false because Magic Login does not require it
-rw-r--r--WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java2
-rw-r--r--WordPress/src/main/java/org/wordpress/android/ui/accounts/login/MagicLinkSignInFragment.java5
2 files changed, 6 insertions, 1 deletions
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java
index e8408f4eb..2f4499bc0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java
@@ -296,7 +296,7 @@ public class SignInFragment extends AbstractFragment implements TextWatcher, Con
});
}
- private boolean isGooglePlayServicesAvailable() {
+ protected boolean isGooglePlayServicesAvailable() {
return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(getActivity()) == ConnectionResult.SUCCESS;
}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/MagicLinkSignInFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/MagicLinkSignInFragment.java
index 0bcf6ba0a..7e047b76a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/MagicLinkSignInFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/MagicLinkSignInFragment.java
@@ -167,6 +167,11 @@ public class MagicLinkSignInFragment extends SignInFragment {
}
@Override
+ protected boolean isGooglePlayServicesAvailable() {
+ return false;
+ }
+
+ @Override
protected void showSelfHostedSignInForm() {
super.showSelfHostedSignInForm();
showPasswordField();