Squashed 'libs/login/' changes from 69e488759c..fc60b518d7

fc60b518d7 Merge branch 'develop' into merge/woocommerce-android/1287
38737cef3b Merge pull request #25 from wordpress-mobile/merge-wpa
d035db2384 Merge commit 'eb8270b278800a6804a2fce6bb63111c0dfa789a' into update-login-lib
4e66d2a380 Move signedin tracking to the google fragment
a1e403a879 Track signed in event on sign up
d983da8c98 Merge pull request #10232 from wordpress-mobile/amanda/login-lib-redirect-support
3bf6e99f15 Merge pull request #24 from wordpress-mobile/merge/WordPress-Android/10255
895ece8fc4 Merge commit '3a2393c33fe8f1f1448591580fc0054a732fac9b' into amanda/login-lib-redirect-support
5a21797a03 Merge pull request #23 from wordpress-mobile/merge/woocommerce-android/1224-amanda-new
8fee8b3660 Updated login and editor libraries to remove right/left attributes when a start/end attribute already exists
2289f9707b Merge commit '43ac7e9468ada491ccd1fcd63cfa1ef0616bd791' into issue/9720-login-subtree-update
b5ac63f082 Fix redundancy in R.string.enter_site_address
bc3903bd29 Update login_invalid_site_url
5d1b930343 Add tests for LoginSiteAddressValidator
ae203df2ec Delete unused R.string.login_empty_site_url
763eeb9490 Replace login_invalid_site_url
1032574f3f Do not report an error if the text is empty
1fa189853a Site Address: Show an error message after 2 sec
e869735555 Do not react to keyboard enter if site is invalid
8d50ab92c6 Move LoginSiteAddress validation to a class
3a9a5c8566 Merge commit 'e3144c2c11b0c982eadb2478cf6926aa40c127e6' into amanda/login-lib-redirect-support
3b1db07c38 Merge commit '615ebab45e1bc3d0cdd3a9da060026fef704d3a8' into amanda/test_git_subtree
a8f234de25 Merge pull request #10150 from wordpress-mobile/amanda/woo-login-test-wp-2
43ac7e9468 Merge pull request #22 from wordpress-mobile/merge-wca
d4d717cf16 Send redirectUrl to listener and strip protocol before saving
6dbf72672a Updated login and editor libraries to remove right/left attributes when a start/end attribute already exists
979ddf4aec Merge commit '827a47189094a6bc7800eaccc3ed069841251373' into sync-login-lib
df3c11ed09 added textAlignment property to secondary button in login
da783ea3c7 Login screens: added textAlignment property to labels
6d486bbf6b Merge pull request #21 from wordpress-mobile/merge-wpa-develop
57a2d00b14 Update login lib standalone FluxC hash
0ea2405def Merge commit 'ad485b27b26ffb38b8718940b0b7556b902dc28c' into sync-login-lib
6df15ab86b Update 2FA unavailable API error message
eefd72f317 Show error and continue login on OAuth client 2FA error
578dca7f29 Update androidx dependencies
1d09d1536d Fix AndroidX import order
48df84638f Fix import ordering for androidx
d3dc35035a Migrate to AndroidX
78c5307f7a Merge pull request #16 from wordpress-mobile/fix_crash_in_login_email_fragment
4d6c83f111 Merge pull request #9890 from wordpress-mobile/update-dagger-version-to-v2.22.1
edd8684ec4 Merge pull request #18 from wordpress-mobile/new-wpandroid-changes
9cbf3f17ff Merge pull request #9885 from wordpress-mobile/update-login-library
71729e5e76 Merge pull request #17 from wordpress-mobile/issue/glide-4.9
0ddf4dcdbd Update Glide version to 4.9.0
f7860b9861 Updated Dagger in the login library
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: fc60b518d7c72864f6df54546d640d0e2fbb8673

Author: AmandaRiu

.idea/codeStyles/Project.xml

@@ -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'
     }
 }
 
@@ -21,8 +21,8 @@ android {
     buildToolsVersion "28.0.3"
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 26
+        minSdkVersion 17
+        targetSdkVersion 28
         versionCode 2
         versionName "1.1"
 
@@ -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"
         }
@@ -68,6 +68,12 @@ dependencies {
     annotationProcessor 'com.google.dagger:dagger-android-processor:2.22.1'
 
     lintChecks 'org.wordpress:lint:1.0.1'
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.27.0'
+    testImplementation 'androidx.arch.core:core-testing:2.0.1'
+    testImplementation 'org.robolectric:robolectric:3.6.1'
+    testImplementation 'org.assertj:assertj-core:3.11.1'
 }
 
 // Add properties named "wp.xxx" to our BuildConfig

WordPressLoginFlow/build.gradle

@@ -500,7 +500,7 @@ public void onSocialChanged(OnSocialChanged event) {
 
     @Override
     protected void onLoginFinished() {
-        mAnalyticsListener.trackAnalyticsSignIn(mAccountStore, mSiteStore, true);
+        mAnalyticsListener.trackAnalyticsSignIn(true);
 
         mLoginListener.startPostLoginServices();
 

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

@@ -1,12 +1,9 @@
 package org.wordpress.android.login;
 
-import org.wordpress.android.fluxc.store.AccountStore;
-import org.wordpress.android.fluxc.store.SiteStore;
-
 import java.util.Map;
 
 public interface LoginAnalyticsListener {
-    void trackAnalyticsSignIn(AccountStore accountStore, SiteStore siteStore, boolean isWpcomLogin);
+    void trackAnalyticsSignIn(boolean isWpcomLogin);
     void trackCreatedAccount(String username, String email);
     void trackEmailFormViewed();
     void trackInsertedInvalidUrl();

WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginAnalyticsListener.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) {

WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseFormFragment.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;
@@ -442,7 +443,7 @@ public void finishLogin() {
 
     @Override
     protected void onLoginFinished() {
-        mAnalyticsListener.trackAnalyticsSignIn(mAccountStore, mSiteStore, true);
+        mAnalyticsListener.trackAnalyticsSignIn(true);
         mLoginListener.loggedInViaSocialAccount(mOldSitesIDs, false);
     }
 
@@ -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)

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

@@ -253,7 +253,7 @@ private void showError(String error) {
 
     @Override
     protected void onLoginFinished() {
-        mAnalyticsListener.trackAnalyticsSignIn(mAccountStore, mSiteStore, true);
+        mAnalyticsListener.trackAnalyticsSignIn(true);
         mLoginListener.startPostLoginServices();
 
         if (mIsSocialLogin) {

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

@@ -48,7 +48,7 @@ interface SelfSignedSSLCallback {
     // Login Site Address input callbacks
     void alreadyLoggedInWpcom(ArrayList<Integer> oldSitesIds);
     void gotWpcomSiteInfo(String siteAddress, String siteName, String siteIconUrl);
-    void gotConnectedSiteInfo(String siteAddress, boolean hasJetpack);
+    void gotConnectedSiteInfo(@NonNull String siteAddress, @Nullable String redirectUrl, boolean hasJetpack);
     void gotXmlRpcEndpoint(String inputSiteAddress, String endpointAddress);
     void handleSslCertificateError(MemorizingTrustManager memorizingTrustManager, SelfSignedSSLCallback callback);
     void helpSiteAddress(String url);

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

@@ -5,9 +5,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
-import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.Patterns;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -18,6 +16,7 @@
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -57,6 +56,8 @@ public class LoginSiteAddressFragment extends LoginBaseFormFragment<LoginListene
 
     private String mRequestedSiteAddress;
 
+    private LoginSiteAddressValidator mLoginSiteAddressValidator;
+
     @Inject AccountStore mAccountStore;
     @Inject Dispatcher mDispatcher;
     @Inject HTTPAuthManager mHTTPAuthManager;
@@ -139,6 +140,23 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         } else {
             mAnalyticsListener.trackUrlFormViewed();
         }
+
+        mLoginSiteAddressValidator = new LoginSiteAddressValidator();
+
+        mLoginSiteAddressValidator.getIsValid().observe(this, new Observer<Boolean>() {
+            @Override public void onChanged(Boolean enabled) {
+                getPrimaryButton().setEnabled(enabled);
+            }
+        });
+        mLoginSiteAddressValidator.getErrorMessageResId().observe(this, new Observer<Integer>() {
+            @Override public void onChanged(Integer resId) {
+                if (resId != null) {
+                    showError(resId);
+                } else {
+                    mSiteAddressInput.setError(null);
+                }
+            }
+        });
     }
 
     @Override
@@ -148,24 +166,17 @@ public void onSaveInstanceState(Bundle outState) {
         outState.putString(KEY_REQUESTED_SITE_ADDRESS, mRequestedSiteAddress);
     }
 
+    @Override public void onDestroyView() {
+        super.onDestroyView();
+        mLoginSiteAddressValidator.dispose();
+    }
+
     protected void discover() {
         if (!NetworkUtils.checkConnection(getActivity())) {
             return;
         }
 
-        String cleanedSiteAddress = getCleanedSiteAddress();
-
-        if (TextUtils.isEmpty(cleanedSiteAddress)) {
-            showError(R.string.login_empty_site_url);
-            return;
-        }
-
-        if (!Patterns.WEB_URL.matcher(cleanedSiteAddress).matches()) {
-            showError(R.string.login_invalid_site_url);
-            return;
-        }
-
-        mRequestedSiteAddress = cleanedSiteAddress;
+        mRequestedSiteAddress = mLoginSiteAddressValidator.getCleanedSiteAddress();
 
         String cleanedXmlrpcSuffix = UrlUtils.removeXmlrpcSuffix(mRequestedSiteAddress);
 
@@ -182,17 +193,16 @@ protected void discover() {
         startProgress();
     }
 
-    private String getCleanedSiteAddress() {
-        return EditTextUtils.getText(mSiteAddressInput.getEditText()).trim().replaceAll("[\r\n]", "");
-    }
-
     @Override
     public void onEditorCommit() {
-        discover();
+        if (getPrimaryButton().isEnabled()) {
+            discover();
+        }
     }
 
     @Override
     public void afterTextChanged(Editable s) {
+        mLoginSiteAddressValidator.setAddress(EditTextUtils.getText(mSiteAddressInput.getEditText()));
     }
 
     @Override
@@ -359,7 +369,7 @@ public void onDiscoverySucceeded(OnDiscoveryResponse event) {
                 return;
             } else {
                 AppLog.e(T.API, "onDiscoveryResponse has error: " + event.error.name()
-                        + " - " + event.error.toString());
+                                + " - " + event.error.toString());
                 handleDiscoveryError(event.error, event.failedEndpoint);
                 return;
             }
@@ -429,7 +439,10 @@ public void onFetchedConnectSiteInfo(OnConnectSiteInfoChecked event) {
                 // Not a WordPress site
                 showError(R.string.enter_wordpress_site);
             } else {
-                mLoginListener.gotConnectedSiteInfo(event.info.url, hasJetpack);
+                mLoginListener.gotConnectedSiteInfo(
+                        event.info.url,
+                        event.info.urlAfterRedirects,
+                        hasJetpack);
             }
         }
     }