Added the correct implementation of .org user tracking to Mixpanel

Author: daniloercoli

WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java

@@ -9,6 +9,7 @@
 import android.os.Build;
 import android.preference.PreferenceManager;
 
+import com.automattic.android.tracks.TracksClient;
 import com.mixpanel.android.mpmetrics.MixpanelAPI;
 
 import org.json.JSONException;
@@ -83,6 +84,13 @@ private void trackMixpanelDataForInstructions(AnalyticsTrackerMixpanelInstructio
             return;
         }
 
+        // Just a security check we're tracking the correct user
+        if (getWordPressComUserName() == null && getAnonID() == null) {
+            this.clearAllData();
+            generateNewAnonID();
+            mMixpanel.identify(getAnonID());
+        }
+
         trackMixpanelEventForInstructions(instructions, properties);
         trackMixpanelPropertiesForInstructions(instructions);
     }
@@ -185,17 +193,41 @@ public void refreshMetadata(boolean isUserConnected, boolean isWordPressComUser,
             AppLog.e(AppLog.T.UTILS, e);
         }
 
+
+        if (isUserConnected && isWordPressComUser) {
+            setWordPressComUserName(username);
+            // Re-unify the user
+            if (getAnonID() != null) {
+                mMixpanel.alias(getWordPressComUserName(), getAnonID());
+                clearAnonID();
+            } else {
+                mMixpanel.identify(username);
+            }
+        } else {
+            // Not wpcom connected. Check if anonID is already present
+            setWordPressComUserName(null);
+            if (getAnonID() == null) {
+                generateNewAnonID();
+            }
+            mMixpanel.identify(getAnonID());
+        }
+
         // Application opened and start.
         if (isUserConnected) {
-            mMixpanel.identify(username);
             try {
-                mMixpanel.getPeople().identify(username);
+                String userID = getWordPressComUserName() != null ? getWordPressComUserName() : getAnonID();
+                if (userID == null) {
+                    // This should not be an option here
+                    return;
+                }
+
+                mMixpanel.getPeople().identify(userID);
                 JSONObject jsonObj = new JSONObject();
-                jsonObj.put("$username", username);
+                jsonObj.put("$username", userID);
                 if (email != null) {
                     jsonObj.put("$email", email);
                 }
-                jsonObj.put("$first_name", username);
+                jsonObj.put("$first_name", userID);
                 mMixpanel.getPeople().set(jsonObj);
             } catch (JSONException e) {
                 AppLog.e(AppLog.T.UTILS, e);
@@ -207,6 +239,7 @@ public void refreshMetadata(boolean isUserConnected, boolean isWordPressComUser,
 
     @Override
     public void clearAllData() {
+        super.clearAllData();
         mMixpanel.clearSuperProperties();
         try {
             mMixpanel.getPeople().clearPushRegistrationId();

WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java

@@ -437,13 +437,11 @@ public void refreshMetadata(boolean isUserConnected, boolean isWordPressComUser,
 
     @Override
     public void clearAllData() {
+        super.clearAllData();
         if (mNosaraClient == null) {
             return;
         }
         mNosaraClient.clearUserProperties();
-        // Reset the anon ID here
-        clearAnonID();
-        setWordPressComUserName(null);
     }
 
     @Override

WordPressAnalytics/src/main/java/org/wordpress/android/analytics/Tracker.java

@@ -16,7 +16,6 @@ public abstract class Tracker {
     abstract void endSession();
     abstract void refreshMetadata(boolean isUserConnected,boolean isWordPressComUser, boolean isJetpackUser,
                          int sessionCount, int numBlogs, int versionCode, String username, String email);
-    abstract void clearAllData();
     abstract void registerPushNotificationToken(String regId);
     abstract String getAnonIdPrefKey();
 
@@ -31,6 +30,12 @@ public Tracker(Context context) {
         mContext = context;
     }
 
+    void clearAllData() {
+        // Reset the anon ID here
+        clearAnonID();
+        setWordPressComUserName(null);
+    }
+
     void clearAnonID() {
         mAnonID = null;
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);