Merge commit '827a47189094a6bc7800eaccc3ed069841251373' into sync-login-lib

aforcier · aforcier · commit 7cbe2ed75cfe · 2019-07-03T08:20:09.000-04:00
# Conflicts:
#	libs/login/WordPressLoginFlow/build.gradle
#	libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java
#	libs/login/gradle.properties-example
diff --git a/vendored/WordPressLoginFlow/build.gradle b/vendored/WordPressLoginFlow/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
     }
 }
 
@@ -35,9 +35,9 @@ dependencies {
         exclude group: "com.mcxiaoke.volley"
     }
 
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
-    implementation 'androidx.media:media:1.0.0'
+    implementation 'androidx.media:media:1.0.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
@@ -51,7 +51,7 @@ dependencies {
             exclude group: "org.wordpress", module: "utils"
         }
     } else {
-        implementation("com.github.wordpress-mobile.WordPress-FluxC-Android:fluxc:8cdbf03cf3d595ef904bab3c1dc207e39242c882") {
+        implementation("com.github.wordpress-mobile.WordPress-FluxC-Android:fluxc:9f07b031646dd3e6021d4b8e0a35647c9109ff27") {
             exclude group: "com.android.support"
             exclude group: "org.wordpress", module: "utils"
         }
diff --git a/vendored/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseFormFragment.java b/vendored/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseFormFragment.java
@@ -34,13 +34,15 @@
 import org.wordpress.android.fluxc.generated.AccountActionBuilder;
 import org.wordpress.android.fluxc.generated.SiteActionBuilder;
 import org.wordpress.android.fluxc.store.AccountStore;
+import org.wordpress.android.fluxc.store.AccountStore.AccountErrorType;
 import org.wordpress.android.fluxc.store.AccountStore.OnAccountChanged;
 import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged;
 import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.EditTextUtils;
 import org.wordpress.android.util.ToastUtils;
+import org.wordpress.android.util.ToastUtils.Duration;
 
 import javax.inject.Inject;
 
@@ -291,9 +293,15 @@ public void onAccountChanged(OnAccountChanged event) {
 
         if (event.isError()) {
             AppLog.e(AppLog.T.API, "onAccountChanged has error: " + event.error.type + " - " + event.error.message);
-            ToastUtils.showToast(getContext(), R.string.error_fetch_my_profile);
-            onLoginFinished(false);
-            return;
+            if (event.error.type == AccountErrorType.SETTINGS_FETCH_REAUTHORIZATION_REQUIRED_ERROR) {
+                // This probably means we're logging in to 2FA-enabled account with a non-production WP.com client id.
+                // A few WordPress.com APIs like /me/settings/ won't work for this account.
+                ToastUtils.showToast(getContext(), R.string.error_disabled_apis, Duration.LONG);
+            } else {
+                ToastUtils.showToast(getContext(), R.string.error_fetch_my_profile, Duration.LONG);
+                onLoginFinished(false);
+                return;
+            }
         }
 
         if (event.causeOfChange == AccountAction.FETCH_ACCOUNT) {
diff --git a/vendored/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java b/vendored/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java
@@ -29,6 +29,7 @@
 import com.google.android.gms.auth.api.credentials.CredentialPickerConfig;
 import com.google.android.gms.auth.api.credentials.HintRequest;
 import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks;
 import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
@@ -462,6 +463,12 @@ public void onConnectionSuspended(int i) {
     }
 
     public void getEmailHints() {
+        GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.getInstance();
+        if (getContext() == null
+            || googleApiAvailability.isGooglePlayServicesAvailable(getContext()) != ConnectionResult.SUCCESS) {
+            AppLog.w(T.NUX, LOG_TAG + ": Couldn't start hint picker - Play Services unavailable");
+            return;
+        }
         HintRequest hintRequest = new HintRequest.Builder()
                 .setHintPickerConfig(new CredentialPickerConfig.Builder()
                         .setShowCancelButton(true)
diff --git a/vendored/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java b/vendored/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java
@@ -15,7 +15,6 @@
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/vendored/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupEmailFragment.java b/vendored/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupEmailFragment.java
@@ -25,6 +25,7 @@
 import com.google.android.gms.auth.api.credentials.CredentialPickerConfig;
 import com.google.android.gms.auth.api.credentials.HintRequest;
 import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks;
 import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
@@ -297,6 +298,12 @@ public void onConnectionSuspended(int i) {
     }
 
     public void getEmailHints() {
+        GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.getInstance();
+        if (getContext() == null
+            || googleApiAvailability.isGooglePlayServicesAvailable(getContext()) != ConnectionResult.SUCCESS) {
+            AppLog.w(T.NUX, LOG_TAG + ": Couldn't start hint picker - Play Services unavailable");
+            return;
+        }
         HintRequest hintRequest = new HintRequest.Builder()
                 .setHintPickerConfig(new CredentialPickerConfig.Builder()
                         .setShowCancelButton(true)
@@ -318,6 +325,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         if (requestCode == EMAIL_CREDENTIALS_REQUEST_CODE) {
+            if (mEmailInput == null) {
+                // Activity result received before the fragments onCreateView(), disregard result.
+                return;
+            }
             if (resultCode == RESULT_OK) {
                 Credential credential = data.getParcelableExtra(Credential.EXTRA_KEY);
                 mEmailInput.getEditText().setText(credential.getId());
diff --git a/vendored/WordPressLoginFlow/src/main/res/drawable/shape_oval_green.xml b/vendored/WordPressLoginFlow/src/main/res/drawable/shape_oval_green.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
+    <solid android:color="@color/alert_green" />
+</shape>
diff --git a/vendored/WordPressLoginFlow/src/main/res/drawable/shape_oval_red.xml b/vendored/WordPressLoginFlow/src/main/res/drawable/shape_oval_red.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
+    <solid android:color="@color/alert_red" />
+</shape>
diff --git a/vendored/WordPressLoginFlow/src/main/res/layout-land/login_magic_link_request_screen.xml b/vendored/WordPressLoginFlow/src/main/res/layout-land/login_magic_link_request_screen.xml
@@ -20,6 +20,7 @@
 
             <ImageView
                 android:id="@+id/gravatar"
+                android:importantForAccessibility="no"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
diff --git a/vendored/WordPressLoginFlow/src/main/res/layout/login_magic_link_request_screen.xml b/vendored/WordPressLoginFlow/src/main/res/layout/login_magic_link_request_screen.xml
@@ -27,6 +27,7 @@
 
                 <ImageView
                     android:id="@+id/gravatar"
+                    android:importantForAccessibility="no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
 
diff --git a/vendored/WordPressLoginFlow/src/main/res/layout/login_username_password_screen.xml b/vendored/WordPressLoginFlow/src/main/res/layout/login_username_password_screen.xml
@@ -28,6 +28,7 @@
 
             <ImageView
                 android:id="@+id/login_blavatar"
+                android:importantForAccessibility="no"
                 android:layout_width="@dimen/blavatar_sz"
                 android:layout_height="@dimen/blavatar_sz"
                 android:background="@android:color/white"
@@ -36,6 +37,7 @@
 
             <ImageView
                 android:id="@+id/login_blavatar_static"
+                android:importantForAccessibility="no"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@color/login_background_color"
diff --git a/vendored/WordPressLoginFlow/src/main/res/values/strings.xml b/vendored/WordPressLoginFlow/src/main/res/values/strings.xml
@@ -83,6 +83,7 @@
     <string name="cannot_add_duplicate_site">This site already exists in the app, you can\'t add it.</string>
     <string name="duplicate_site_detected">A duplicate site has been detected.</string>
     <string name="error_fetch_my_profile">Couldn\'t retrieve your profile</string>
+    <string name="error_disabled_apis">Could not fetch settings: Some APIs are unavailable for this OAuth app ID + account combination.</string>
     <string name="login_to_to_connect_jetpack">Log in to the WordPress.com account you used to connect Jetpack.</string>
     <string name="auth_required">Log in again to continue.</string>
     <string name="checking_email">Checking email</string>

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`jcenter()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:3.3.1'`
	`7`	`+ classpath 'com.android.tools.build:gradle:3.3.2'`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
`@@ -35,9 +35,9 @@ dependencies {`
`35`	`35`	`exclude group: "com.mcxiaoke.volley"`
`36`	`36`	`}`
`37`	`37`
`38`		`- implementation 'androidx.appcompat:appcompat:1.0.0'`
	`38`	`+ implementation 'androidx.appcompat:appcompat:1.0.2'`
`39`	`39`	`implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0'`
`40`		`- implementation 'androidx.media:media:1.0.0'`
	`40`	`+ implementation 'androidx.media:media:1.0.1'`
`41`	`41`	`implementation 'androidx.legacy:legacy-support-v13:1.0.0'`
`42`	`42`	`implementation 'androidx.gridlayout:gridlayout:1.0.0'`
`43`	`43`	`implementation 'com.google.android.material:material:1.0.0'`
`@@ -51,7 +51,7 @@ dependencies {`
`51`	`51`	`exclude group: "org.wordpress", module: "utils"`
`52`	`52`	`}`
`53`	`53`	`} else {`
`54`		`- implementation("com.github.wordpress-mobile.WordPress-FluxC-Android:fluxc:8cdbf03cf3d595ef904bab3c1dc207e39242c882") {`
	`54`	`+ implementation("com.github.wordpress-mobile.WordPress-FluxC-Android:fluxc:9f07b031646dd3e6021d4b8e0a35647c9109ff27") {`
`55`	`55`	`exclude group: "com.android.support"`
`56`	`56`	`exclude group: "org.wordpress", module: "utils"`
`57`	`57`	`}`