Updating analytics based on feedback from PR

tonyr59h · tonyr59h · commit 9383f4f7c680 · 2015-12-09T13:49:25.000-08:00
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
@@ -19,6 +19,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 class DotComSiteSettings extends SiteSettingsInterface {
@@ -89,10 +91,19 @@ public void onResponse(JSONObject response) {
                         AppLog.d(AppLog.T.API, "Site Settings saved remotely");
                         notifySavedOnUiThread(null);
                         mRemoteSettings.copyFrom(mSettings);
-                        HashMap<String, Object> properties = new HashMap<>();
-                        properties.put("items_saved", response);
-                        AnalyticsUtils.trackWithCurrentBlogDetails(
-                                AnalyticsTracker.Stat.SETTINGS_SAVED_REMOTELY, properties);
+
+                        if (response != null) {
+                            List<String> itemKeys = new ArrayList<>();
+                            JSONObject updated = response.optJSONObject("updated");
+                            if (updated == null) return;
+                            Iterator<String> keys = updated.keys();
+                            while (keys.hasNext()) itemKeys.add(keys.next());
+
+                            HashMap<String, Object> properties = new HashMap<>();
+                            properties.put("items_saved", itemKeys);
+                            AnalyticsUtils.trackWithCurrentBlogDetails(
+                                    AnalyticsTracker.Stat.SITE_SETTINGS_SAVED_REMOTELY, properties);
+                        }
                     }
                 }, new RestRequest.ErrorListener() {
                     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/LearnMorePreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/LearnMorePreference.java
@@ -43,7 +43,7 @@ public void onClick(View v) {
         if (mDialog != null) return;
 
         AnalyticsUtils.trackWithCurrentBlogDetails(
-                AnalyticsTracker.Stat.SETTINGS_LEARN_MORE_CLICKED);
+                AnalyticsTracker.Stat.SITE_SETTINGS_LEARN_MORE_CLICKED);
 
         Context context = getContext();
         mDialog = new Dialog(context);
@@ -57,7 +57,7 @@ public void onPageFinished(WebView webView, String url) {
                 super.onPageFinished(webView, url);
                 if (mDialog != null) {
                     AnalyticsUtils.trackWithCurrentBlogDetails(
-                            AnalyticsTracker.Stat.SETTINGS_LEARN_MORE_LOADED);
+                            AnalyticsTracker.Stat.SITE_SETTINGS_LEARN_MORE_LOADED);
                     mDialog.setContentView(webView);
                 }
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
@@ -19,8 +19,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 class SelfHostedSiteSettings extends SiteSettingsInterface {
     // XML-RPC wp.getOptions keys
@@ -88,10 +90,18 @@ public void saveSettings() {
             public void onSuccess(long id, final Object result) {
                 notifySavedOnUiThread(null);
                 mRemoteSettings.copyFrom(mSettings);
-                HashMap<String, Object> properties = new HashMap<>();
-                properties.put("items_saved", result);
-                AnalyticsUtils.trackWithCurrentBlogDetails(
-                        AnalyticsTracker.Stat.SETTINGS_SAVED_REMOTELY, properties);
+
+                if (result != null) {
+                    HashMap<String, Object> properties = new HashMap<>();
+                    if (result instanceof Map) {
+                        Set keys = ((Map) result).keySet();
+                        List keyList = new ArrayList();
+                        for (Object key : keys) keyList.add(key);
+                        properties.put("items_saved", keyList);
+                    }
+                    AnalyticsUtils.trackWithCurrentBlogDetails(
+                            AnalyticsTracker.Stat.SITE_SETTINGS_SAVED_REMOTELY, properties);
+                }
             }
 
             @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -127,7 +127,7 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         AnalyticsUtils.trackWithCurrentBlogDetails(
-                AnalyticsTracker.Stat.SETTINGS_ACCESSED_SITE_SETTINGS);
+                AnalyticsTracker.Stat.SITE_SETTINGS_ACCESSED);
 
         mShouldFetch = true;
         mSiteSettings = SiteSettingsInterface.getInterface(getActivity(), mBlog, this);
@@ -215,7 +215,7 @@ public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference prefere
         // Add Action Bar to sub-screens
         if (preference == findPreference(getString(R.string.pref_key_site_more_discussion))) {
             AnalyticsUtils.trackWithCurrentBlogDetails(
-                    AnalyticsTracker.Stat.SETTINGS_ACCESSED_MORE_SETTINGS);
+                    AnalyticsTracker.Stat.SITE_SETTINGS_ACCESSED_MORE_SETTINGS);
             Dialog dialog = ((PreferenceScreen) preference).getDialog();
             if (dialog != null) {
                 ListView prefList = (ListView) dialog.findViewById(android.R.id.list);
@@ -355,7 +355,7 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
                     HashMap<String, Object> properties = new HashMap<>();
                     properties.put("hint_shown", hintObj.getHint());
                     AnalyticsUtils.trackWithCurrentBlogDetails(
-                            AnalyticsTracker.Stat.SETTINGS_HINT_TOAST_SHOWN, properties);
+                            AnalyticsTracker.Stat.SITE_SETTINGS_HINT_TOAST_SHOWN, properties);
                     ToastUtils.showToast(getActivity(), hintObj.getHint(), ToastUtils.Duration.SHORT);
                 }
                 return true;
@@ -818,7 +818,7 @@ public boolean onDeleteRequested() {
                 HashMap<String, Object> properties = new HashMap<>();
                 properties.put("num_items_deleted", checkedItems.size());
                 AnalyticsUtils.trackWithCurrentBlogDetails(
-                        AnalyticsTracker.Stat.SETTINGS_DELETED_LIST_ITEMS, properties);
+                        AnalyticsTracker.Stat.SITE_SETTINGS_DELETED_LIST_ITEMS, properties);
 
                 ListAdapter adapter = list.getAdapter();
                 for (int i = 0; i < checkedItems.size(); i++) {
@@ -856,7 +856,7 @@ public void onClick(DialogInterface dialog, int which) {
                                     R.layout.wp_simple_list_item_1,
                                     mEditingList));
                             AnalyticsUtils.trackWithCurrentBlogDetails(
-                                    AnalyticsTracker.Stat.SETTINGS_ADDED_LIST_ITEM);
+                                    AnalyticsTracker.Stat.SITE_SETTINGS_ADDED_LIST_ITEM);
                         }
                     }
                 });
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
@@ -120,14 +120,14 @@ public enum Stat {
         THEMES_SUPPORT_ACCESSED,
         THEMES_DETAILS_ACCESSED,
         SETTINGS_LANGUAGE_SELECTION_FORCED,
-        SETTINGS_ACCESSED_SITE_SETTINGS,
-        SETTINGS_ACCESSED_MORE_SETTINGS,
-        SETTINGS_LEARN_MORE_CLICKED,
-        SETTINGS_LEARN_MORE_LOADED,
-        SETTINGS_ADDED_LIST_ITEM,
-        SETTINGS_DELETED_LIST_ITEMS,
-        SETTINGS_SAVED_REMOTELY,
-        SETTINGS_HINT_TOAST_SHOWN,
+        SITE_SETTINGS_ACCESSED,
+        SITE_SETTINGS_ACCESSED_MORE_SETTINGS,
+        SITE_SETTINGS_LEARN_MORE_CLICKED,
+        SITE_SETTINGS_LEARN_MORE_LOADED,
+        SITE_SETTINGS_ADDED_LIST_ITEM,
+        SITE_SETTINGS_DELETED_LIST_ITEMS,
+        SITE_SETTINGS_SAVED_REMOTELY,
+        SITE_SETTINGS_HINT_TOAST_SHOWN,
     }
 
     private static final List<Tracker> TRACKERS = new ArrayList<>();
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
@@ -791,42 +791,42 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Forced Language Selection");
                 break;
-            case SETTINGS_ACCESSED_SITE_SETTINGS:
+            case SITE_SETTINGS_ACCESSED:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Site Settings Accessed");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_settings_accessed");
                 break;
-            case SETTINGS_ACCESSED_MORE_SETTINGS:
+            case SITE_SETTINGS_ACCESSED_MORE_SETTINGS:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - More Settings Accessed");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_more_settings_accessed");
                 break;
-            case SETTINGS_ADDED_LIST_ITEM:
+            case SITE_SETTINGS_ADDED_LIST_ITEM:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Added List Item");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_list_items_added");
                 break;
-            case SETTINGS_DELETED_LIST_ITEMS:
+            case SITE_SETTINGS_DELETED_LIST_ITEMS:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Site Deleted List Items");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_list_items_were_deleted");
                 break;
-            case SETTINGS_HINT_TOAST_SHOWN:
+            case SITE_SETTINGS_HINT_TOAST_SHOWN:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Preference Hint Shown");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_preference_hints_viewed");
                 break;
-            case SETTINGS_LEARN_MORE_CLICKED:
+            case SITE_SETTINGS_LEARN_MORE_CLICKED:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Learn More Clicked");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_learn_more_clicked");
                 break;
-            case SETTINGS_LEARN_MORE_LOADED:
+            case SITE_SETTINGS_LEARN_MORE_LOADED:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Learn More Loaded");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_learn_more_seen");
                 break;
-            case SETTINGS_SAVED_REMOTELY:
+            case SITE_SETTINGS_SAVED_REMOTELY:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Saved Remotely");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_settings_updated_remotely");
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
@@ -375,29 +375,29 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case SETTINGS_LANGUAGE_SELECTION_FORCED:
                 eventName = "settings_language_selection_forced";
                 break;
-            case SETTINGS_ACCESSED_SITE_SETTINGS:
-                eventName = "settings_site_settings_accessed";
+            case SITE_SETTINGS_ACCESSED:
+                eventName = "site_settings_accessed";
                 break;
-            case SETTINGS_ACCESSED_MORE_SETTINGS:
-                eventName = "settings_more_settings_accessed";
+            case SITE_SETTINGS_ACCESSED_MORE_SETTINGS:
+                eventName = "site_settings_more_settings_accessed";
                 break;
-            case SETTINGS_ADDED_LIST_ITEM:
-                eventName = "settings_added_list_item";
+            case SITE_SETTINGS_ADDED_LIST_ITEM:
+                eventName = "site_settings_added_list_item";
                 break;
-            case SETTINGS_DELETED_LIST_ITEMS:
-                eventName = "settings_deleted_list_items";
+            case SITE_SETTINGS_DELETED_LIST_ITEMS:
+                eventName = "site_settings_deleted_list_items";
                 break;
-            case SETTINGS_HINT_TOAST_SHOWN:
-                eventName = "settings_hint_toast_shown";
+            case SITE_SETTINGS_HINT_TOAST_SHOWN:
+                eventName = "site_settings_hint_toast_shown";
                 break;
-            case SETTINGS_LEARN_MORE_CLICKED:
-                eventName = "settings_learn_more_clicked";
+            case SITE_SETTINGS_LEARN_MORE_CLICKED:
+                eventName = "site_settings_learn_more_clicked";
                 break;
-            case SETTINGS_LEARN_MORE_LOADED:
-                eventName = "settings_learn_more_loaded";
+            case SITE_SETTINGS_LEARN_MORE_LOADED:
+                eventName = "site_settings_learn_more_loaded";
                 break;
-            case SETTINGS_SAVED_REMOTELY:
-                eventName = "settings_saved_remotely";
+            case SITE_SETTINGS_SAVED_REMOTELY:
+                eventName = "site_settings_saved_remotely";
                 break;
             default:
                 eventName = null;
