Skip to content

Commit 4145675

Browse files
authored
Merge pull request #9831 from wordpress-mobile/issue/9826-fix-for-9.0-devices-without-play-services-installed
Fix #9826: make sure we Play Services are available before running the email hint picker.
2 parents 91ee2fa + 95fd8a9 commit 4145675

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.google.android.gms.auth.api.credentials.CredentialPickerConfig;
2828
import com.google.android.gms.auth.api.credentials.HintRequest;
2929
import com.google.android.gms.common.ConnectionResult;
30+
import com.google.android.gms.common.GoogleApiAvailability;
3031
import com.google.android.gms.common.api.GoogleApiClient;
3132
import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks;
3233
import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
@@ -424,6 +425,12 @@ public void onConnectionSuspended(int i) {
424425
}
425426

426427
public void getEmailHints() {
428+
GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.getInstance();
429+
if (getContext() == null
430+
|| googleApiAvailability.isGooglePlayServicesAvailable(getContext()) != ConnectionResult.SUCCESS) {
431+
AppLog.w(T.NUX, LOG_TAG + ": Couldn't start hint picker - Play Services unavailable");
432+
return;
433+
}
427434
HintRequest hintRequest = new HintRequest.Builder()
428435
.setHintPickerConfig(new CredentialPickerConfig.Builder()
429436
.setShowCancelButton(true)

libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupEmailFragment.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.google.android.gms.auth.api.credentials.CredentialPickerConfig;
2525
import com.google.android.gms.auth.api.credentials.HintRequest;
2626
import com.google.android.gms.common.ConnectionResult;
27+
import com.google.android.gms.common.GoogleApiAvailability;
2728
import com.google.android.gms.common.api.GoogleApiClient;
2829
import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks;
2930
import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
@@ -296,6 +297,12 @@ public void onConnectionSuspended(int i) {
296297
}
297298

298299
public void getEmailHints() {
300+
GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.getInstance();
301+
if (getContext() == null
302+
|| googleApiAvailability.isGooglePlayServicesAvailable(getContext()) != ConnectionResult.SUCCESS) {
303+
AppLog.w(T.NUX, LOG_TAG + ": Couldn't start hint picker - Play Services unavailable");
304+
return;
305+
}
299306
HintRequest hintRequest = new HintRequest.Builder()
300307
.setHintPickerConfig(new CredentialPickerConfig.Builder()
301308
.setShowCancelButton(true)

0 commit comments

Comments
 (0)