Merge commit 'aec4a8317d3188866c02556c182cd8d09d9b0272' into merge-login-lib

# Conflicts:
#	libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java

Author: aforcier

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

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

libs/login/src/main/java/org/wordpress/android/login/LoginAnalyticsListener.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();

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

@@ -443,7 +443,7 @@ public void finishLogin() {
 
     @Override
     protected void onLoginFinished() {
-        mAnalyticsListener.trackAnalyticsSignIn(mAccountStore, mSiteStore, true);
+        mAnalyticsListener.trackAnalyticsSignIn(true);
         mLoginListener.loggedInViaSocialAccount(mOldSitesIDs, false);
     }
 

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

libs/login/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java

@@ -445,15 +445,15 @@ public void onAuthenticationChanged(OnAuthenticationChanged event) {
 
     @Override
     protected void onLoginFinished() {
-        mAnalyticsListener.trackAnalyticsSignIn(mAccountStore, mSiteStore, mIsWpcom);
+        mAnalyticsListener.trackAnalyticsSignIn(mIsWpcom);
 
         mLoginListener.startPostLoginServices();
 
         mLoginListener.loggedInViaPassword(mOldSitesIDs);
     }
 
     private void finishLogin() {
-        mAnalyticsListener.trackAnalyticsSignIn(mAccountStore, mSiteStore, mIsWpcom);
+        mAnalyticsListener.trackAnalyticsSignIn(mIsWpcom);
 
         // mark as finished so any subsequent onSiteChanged (e.g. triggered by WPMainActivity) won't be intercepted
         mLoginFinished = true;

libs/login/src/main/java/org/wordpress/android/login/SignupGoogleFragment.java

@@ -203,6 +203,7 @@ public void onAuthenticationChanged(OnAuthenticationChanged event) {
             AppLog.d(T.MAIN,
                     "GOOGLE SIGNUP: onAuthenticationChanged - new wordpress account created");
             mAnalyticsListener.trackCreatedAccount(event.userName, mGoogleEmail);
+            mAnalyticsListener.trackAnalyticsSignIn(true);
             mGoogleListener.onGoogleSignupFinished(mDisplayName, mGoogleEmail, mPhotoUrl, event.userName);
             // Continue with login since existing account was selected.
         } else {