Skip to content

Commit ad485b2

Browse files
committed
Squashed 'libs/login/' changes from f52c56b481..78c5307f7a
78c5307f7a Merge pull request #16 from wordpress-mobile/fix_crash_in_login_email_fragment edd8684ec4 Merge pull request #18 from wordpress-mobile/new-wpandroid-changes 71729e5e76 Merge pull request #17 from wordpress-mobile/issue/glide-4.9 aabdedf672 Merge commit '099b5a011d32283eb6c79b0e599b5272a597e849' into update-login-library 1eb7f4f156 Updated Glide to 4.9.0 a32cc8c09d Add crash fix to SignupEmailFragment 08109fa90f Adds non-null check to onActivityResult 664b67f62d Fix #9826: make sure we Play Services are available before running the email hint picker 94a0ae2a39 Merge pull request #9743 from wordpress-mobile/feature/manage_insights_readonly 7cad17e264 Fix a few ContentDescription lint errors 9f171b55d0 Merge branch 'feature/manage_insights_readonly' into issue/9464-manage-insights 663a168903 Add the missing drawable resources git-subtree-dir: libs/login git-subtree-split: 78c5307f7a8a15cae1a164e4cbb0b7b924a37d37
1 parent 099b5a0 commit ad485b2

File tree

8 files changed

+32
-2
lines changed

8 files changed

+32
-2
lines changed

WordPressLoginFlow/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ dependencies {
5757
}
5858
}
5959

60-
implementation 'com.github.bumptech.glide:glide:4.6.1'
61-
annotationProcessor 'com.github.bumptech.glide:compiler:4.6.1'
60+
implementation 'com.github.bumptech.glide:glide:4.9.0'
61+
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
6262

6363
// Dagger
6464
implementation 'com.google.dagger:dagger:2.11'

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)

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

Lines changed: 11 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)
@@ -317,6 +324,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
317324
super.onActivityResult(requestCode, resultCode, data);
318325

319326
if (requestCode == EMAIL_CREDENTIALS_REQUEST_CODE) {
327+
if (mEmailInput == null) {
328+
// Activity result received before the fragments onCreateView(), disregard result.
329+
return;
330+
}
320331
if (resultCode == RESULT_OK) {
321332
Credential credential = data.getParcelableExtra(Credential.EXTRA_KEY);
322333
mEmailInput.getEditText().setText(credential.getId());
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
3+
<solid android:color="@color/alert_green" />
4+
</shape>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
3+
<solid android:color="@color/alert_red" />
4+
</shape>

WordPressLoginFlow/src/main/res/layout-land/login_magic_link_request_screen.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
<ImageView
2222
android:id="@+id/gravatar"
23+
android:importantForAccessibility="no"
2324
android:layout_width="wrap_content"
2425
android:layout_height="wrap_content"/>
2526

WordPressLoginFlow/src/main/res/layout/login_magic_link_request_screen.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
<ImageView
2929
android:id="@+id/gravatar"
30+
android:importantForAccessibility="no"
3031
android:layout_width="wrap_content"
3132
android:layout_height="wrap_content"/>
3233

WordPressLoginFlow/src/main/res/layout/login_username_password_screen.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
<ImageView
3030
android:id="@+id/login_blavatar"
31+
android:importantForAccessibility="no"
3132
android:layout_width="@dimen/blavatar_sz"
3233
android:layout_height="@dimen/blavatar_sz"
3334
android:background="@android:color/white"
@@ -36,6 +37,7 @@
3637

3738
<ImageView
3839
android:id="@+id/login_blavatar_static"
40+
android:importantForAccessibility="no"
3941
android:layout_width="wrap_content"
4042
android:layout_height="wrap_content"
4143
android:background="@color/login_background_color"

0 commit comments

Comments
 (0)