Added logic to redirect Woo users to email login or jetpack required screen

anitaa1990 · anitaa1990 · commit 39b0ee010fa4 · 2019-10-19T23:52:09.000+05:30
diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java
@@ -50,12 +50,14 @@
 public class LoginSiteAddressFragment extends LoginBaseFormFragment<LoginListener> implements TextWatcher,
         OnEditorCommitListener {
     private static final String KEY_REQUESTED_SITE_ADDRESS = "KEY_REQUESTED_SITE_ADDRESS";
+    private static final String KEY_HAS_JETPACK = "KEY_HAS_JETPACK";
 
     public static final String TAG = "login_site_address_fragment_tag";
 
     private WPLoginInputRow mSiteAddressInput;
 
     private String mRequestedSiteAddress;
+    private boolean mHasJetpack;
 
     private LoginSiteAddressValidator mLoginSiteAddressValidator;
 
@@ -138,6 +140,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         if (savedInstanceState != null) {
             mRequestedSiteAddress = savedInstanceState.getString(KEY_REQUESTED_SITE_ADDRESS);
+            mHasJetpack = savedInstanceState.getBoolean(KEY_HAS_JETPACK);
         } else {
             mAnalyticsListener.trackUrlFormViewed();
         }
@@ -165,6 +168,7 @@ public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 
         outState.putString(KEY_REQUESTED_SITE_ADDRESS, mRequestedSiteAddress);
+        outState.putBoolean(KEY_HAS_JETPACK, mHasJetpack);
     }
 
     @Override public void onDestroyView() {
@@ -305,10 +309,16 @@ public void onWPComSiteFetched(OnWPComSiteFetched event) {
                 showError(R.string.invalid_site_url_message);
                 endProgress();
             } else {
+                mHasJetpack = false;
                 // Start the discovery process
                 mDispatcher.dispatch(AuthenticationActionBuilder.newDiscoverEndpointAction(mRequestedSiteAddress));
             }
         } else {
+            // Woo Login: verify if Jetpack is installed/active/connected
+            if (mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE) {
+                mHasJetpack = event.site.isJetpackInstalled() && event.site.isJetpackConnected();
+            }
+
             if (event.site.isJetpackInstalled() && mLoginListener.getLoginMode() != LoginMode.WPCOM_LOGIN_ONLY) {
                 // If Jetpack site, treat it as self-hosted and start the discovery process
                 // An exception is WPCOM_LOGIN_ONLY mode - in that case we're only interested in adding sites
@@ -319,6 +329,12 @@ public void onWPComSiteFetched(OnWPComSiteFetched event) {
 
             endProgress();
 
+            // Woo login: if jetpack is not installed/active/connected, redirect to Jetpack required
+            if (mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE) {
+                mLoginListener.gotConnectedSiteInfo(event.site.getUrl(), null, mHasJetpack);
+                return;
+            }
+
             // it's a wp.com site so, treat it as such.
             mLoginListener.gotWpcomSiteInfo(
                     UrlUtils.removeScheme(event.site.getUrl()),
@@ -360,6 +376,9 @@ public void onDiscoverySucceeded(OnDiscoveryResponse event) {
 
                     ArrayList<Integer> oldSitesIDs = SiteUtils.getCurrentSiteIds(mSiteStore, true);
                     mLoginListener.alreadyLoggedInWpcom(oldSitesIDs);
+                } else if (mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE) {
+                    // Woo login: if jetpack is not installed/active/connected, redirect to Jetpack required
+                    mLoginListener.gotConnectedSiteInfo(event.failedEndpoint, null, mHasJetpack);
                 } else {
                     mLoginListener.gotWpcomSiteInfo(event.failedEndpoint, null, null);
                 }
@@ -374,6 +393,13 @@ public void onDiscoverySucceeded(OnDiscoveryResponse event) {
         }
 
         AppLog.i(T.NUX, "Discovery succeeded, endpoint: " + event.xmlRpcEndpoint);
+
+        // Woo login: if jetpack is not installed/active/connected, redirect to Jetpack required
+        if (mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE) {
+            mLoginListener.gotConnectedSiteInfo(requestedSiteAddress, null, mHasJetpack);
+            return;
+        }
+
         mLoginListener.gotXmlRpcEndpoint(requestedSiteAddress, event.xmlRpcEndpoint);
     }
 
