Move Tracks anonID related methods to a common class.

Author: daniloercoli

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

@@ -4,9 +4,12 @@
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
+import org.wordpress.android.util.AppLog;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 public final class AnalyticsTracker {
     private static boolean mHasUserOptedOut;
@@ -106,16 +109,6 @@ public enum Stat {
         NOTIFICATION_SETTINGS_UPDATED,
     }
 
-    public interface Tracker {
-        void track(Stat stat);
-        void track(Stat stat, Map<String, ?> properties);
-        void endSession();
-        void refreshMetadata(boolean isUserConnected,boolean isWordPressComUser, boolean isJetpackUser,
-                             int sessionCount, int numBlogs, int versionCode, String username, String email);
-        void clearAllData();
-        void registerPushNotificationToken(String regId);
-    }
-
     private static final List<Tracker> TRACKERS = new ArrayList<Tracker>();
 
     private AnalyticsTracker() {

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

@@ -19,10 +19,9 @@
 import java.util.Iterator;
 import java.util.Map;
 
-public class AnalyticsTrackerMixpanel implements AnalyticsTracker.Tracker {
+public class AnalyticsTrackerMixpanel extends Tracker {
     public static final String SESSION_COUNT = "sessionCount";
 
-    private Context mContext;
     private MixpanelAPI mMixpanel;
     private EnumMap<AnalyticsTracker.Stat, JSONObject> mAggregatedProperties;
     private static final String MIXPANEL_PLATFORM = "platform";
@@ -32,11 +31,12 @@ public class AnalyticsTrackerMixpanel implements AnalyticsTracker.Tracker {
     private static final String MIXPANEL_NUMBER_OF_BLOGS = "number_of_blogs";
     private static final String VERSION_CODE = "version_code";
     private static final String APP_LOCALE = "app_locale";
+    private static final String MIXPANEL_ANON_ID = "mixpanel_user_anon_id";
 
     public AnalyticsTrackerMixpanel(Context context, String token) {
+        super(context);
         mAggregatedProperties = new EnumMap<AnalyticsTracker.Stat, JSONObject>(AnalyticsTracker.Stat.class);
         mMixpanel = MixpanelAPI.getInstance(context, token);
-        mContext = context;
     }
 
     @SuppressWarnings("deprecation")
@@ -57,6 +57,10 @@ public static void showNotification(Context context, PendingIntent intent, int n
         nm.notify(0, notification);
     }
 
+    String getAnonIdPrefKey() {
+        return MIXPANEL_ANON_ID;
+    }
+
     @Override
     public void track(AnalyticsTracker.Stat stat) {
         track(stat, null);

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

@@ -14,7 +14,7 @@
 import java.util.Map;
 import java.util.UUID;
 
-public class AnalyticsTrackerNosara implements AnalyticsTracker.Tracker {
+public class AnalyticsTrackerNosara extends Tracker {
 
     private static final String JETPACK_USER = "jetpack_user";
     private static final String NUMBER_OF_BLOGS = "number_of_blogs";
@@ -23,20 +23,21 @@ public class AnalyticsTrackerNosara implements AnalyticsTracker.Tracker {
     private static final String EVENTS_PREFIX = "wpandroid_";
 
     private String mWpcomUserName = null;
-    private String mAnonID = null; // do not access this variable directly. Use methods.
-
     private TracksClient mNosaraClient;
-    private Context mContext;
 
     public AnalyticsTrackerNosara(Context context) {
+        super(context);
         if (null == context) {
             mNosaraClient = null;
             return;
         }
-        mContext = context;
         mNosaraClient = TracksClient.getClient(context);
     }
 
+    String getAnonIdPrefKey() {
+        return TRACKS_ANON_ID;
+    }
+
     @Override
     public void track(AnalyticsTracker.Stat stat) {
         track(stat, null);
@@ -391,41 +392,7 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
         }
     }
 
-    private void clearAnonID() {
-        mAnonID = null;
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
-        if (preferences.contains(TRACKS_ANON_ID)) {
-            final SharedPreferences.Editor editor = preferences.edit();
-            editor.remove(TRACKS_ANON_ID);
-            editor.commit();
-        }
-    }
 
-    private String getAnonID() {
-        if (mAnonID == null) {
-            SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
-            mAnonID = preferences.getString(TRACKS_ANON_ID, null);
-        }
-        return mAnonID;
-    }
-
-    private String generateNewAnonID() {
-        String uuid = UUID.randomUUID().toString();
-        String[] uuidSplitted = uuid.split("-");
-        StringBuilder builder = new StringBuilder();
-        for (String currentPart : uuidSplitted) {
-            builder.append(currentPart);
-        }
-        uuid = builder.toString();
-        AppLog.d(AppLog.T.STATS, "New anon ID generated: " + uuid);
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
-        final SharedPreferences.Editor editor = preferences.edit();
-        editor.putString(TRACKS_ANON_ID, uuid);
-        editor.commit();
-
-        mAnonID = uuid;
-        return uuid;
-    }
 
     @Override
     public void endSession() {

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

@@ -0,0 +1,69 @@
+package org.wordpress.android.analytics;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import java.util.Map;
+import java.util.UUID;
+
+import org.wordpress.android.analytics.AnalyticsTracker.Stat;
+import org.wordpress.android.util.AppLog;
+
+public abstract class Tracker {
+    abstract void track(Stat stat);
+    abstract void track(Stat stat, Map<String, ?> properties);
+    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();
+
+    private String mAnonID = null; // do not access this variable directly. Use methods.
+    Context mContext;
+
+    public Tracker(Context context) {
+        if (null == context) {
+            return;
+        }
+        mContext = context;
+    }
+
+    void clearAnonID() {
+        mAnonID = null;
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
+        if (preferences.contains(getAnonIdPrefKey())) {
+            final SharedPreferences.Editor editor = preferences.edit();
+            editor.remove(getAnonIdPrefKey());
+            editor.commit();
+        }
+    }
+
+    String getAnonID() {
+        if (mAnonID == null) {
+            SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
+            mAnonID = preferences.getString(getAnonIdPrefKey(), null);
+        }
+        return mAnonID;
+    }
+
+    String generateNewAnonID() {
+        String uuid = UUID.randomUUID().toString();
+        String[] uuidSplitted = uuid.split("-");
+        StringBuilder builder = new StringBuilder();
+        for (String currentPart : uuidSplitted) {
+            builder.append(currentPart);
+        }
+        uuid = builder.toString();
+        AppLog.d(AppLog.T.STATS, "New anon ID generated: " + uuid);
+
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
+        final SharedPreferences.Editor editor = preferences.edit();
+        editor.putString(getAnonIdPrefKey(), uuid);
+        editor.commit();
+
+        mAnonID = uuid;
+        return uuid;
+    }
+}