Squashed 'libs/login/' changes from 43ac7e9468..3b1db07c38

3b1db07c38 Merge commit '615ebab45e1bc3d0cdd3a9da060026fef704d3a8' into amanda/test_git_subtree
d4d717cf16 Send redirectUrl to listener and strip protocol before saving

git-subtree-dir: libs/login
git-subtree-split: 3b1db07c3872c0935c721f1b5a8e5c4a9eaf9f97

Author: AmandaRiu

WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginListener.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/LoginSiteAddressFragment.java

@@ -425,7 +425,10 @@ public void onFetchedConnectSiteInfo(OnConnectSiteInfoChecked event) {
                 } else if (event.info.hasJetpack && event.info.isJetpackActive && event.info.isJetpackConnected) {
                     hasJetpack = true;
                 }
-                mLoginListener.gotConnectedSiteInfo(event.info.url, hasJetpack);
+                mLoginListener.gotConnectedSiteInfo(
+                        event.info.url,
+                        event.info.urlAfterRedirects,
+                        hasJetpack);
             }
         }
     }