Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop

Author: maxme

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

@@ -25,7 +25,6 @@ public enum Stat {
         READER_ARTICLE_COMMENTED_ON,
         READER_ARTICLE_LIKED,
         READER_ARTICLE_OPENED,
-        READER_ARTICLE_REBLOGGED,
         READER_ARTICLE_UNLIKED,
         READER_BLOG_BLOCKED,
         READER_BLOG_FOLLOWED,
@@ -49,7 +48,6 @@ public enum Stat {
         STATS_PERIOD_YEARS_ACCESSED,
         STATS_VIEW_ALL_ACCESSED,
         STATS_SINGLE_POST_ACCESSED,
-        STATS_OPENED_WEB_VERSION,
         STATS_TAPPED_BAR_CHART,
         STATS_SCROLLED_TO_BOTTOM,
         STATS_WIDGET_ADDED,

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

@@ -299,12 +299,6 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_opened_article");
                 instructions.setCurrentDateForPeopleProperty("last_time_opened_reader_article");
                 break;
-            case READER_ARTICLE_REBLOGGED:
-                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
-                        mixpanelInstructionsForEventName("Reader - Reblogged Article");
-                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_reblogged_article");
-                instructions.setCurrentDateForPeopleProperty("last_time_reblogged_article");
-                break;
             case READER_ARTICLE_UNLIKED:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Reader - Unliked Article");
@@ -655,12 +649,6 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_accessed_single_post_screen_stats");
                 instructions.setCurrentDateForPeopleProperty("last_time_accessed_single_post_screen_stats");
                 break;
-            case STATS_OPENED_WEB_VERSION:
-                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
-                        mixpanelInstructionsForEventName("Stats - Opened Web Version");
-                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_accessed_web_version_of_stats");
-                instructions.setCurrentDateForPeopleProperty("last_time_accessed_web_version_of_stats");
-                break;
             case STATS_TAPPED_BAR_CHART:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Stats - Tapped Bar Chart");

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

@@ -69,9 +69,6 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case READER_ARTICLE_OPENED:
                 eventName = "reader_article_opened";
                 break;
-            case READER_ARTICLE_REBLOGGED:
-                eventName = "reader_article_reblogged";
-                break;
             case READER_ARTICLE_UNLIKED:
                 eventName = "reader_article_unliked";
                 break;
@@ -285,9 +282,6 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case STATS_SINGLE_POST_ACCESSED:
                 eventName = "stats_single_post_accessed";
                 break;
-            case STATS_OPENED_WEB_VERSION:
-                eventName = "stats_web_version_accessed";
-                break;
             case STATS_TAPPED_BAR_CHART:
                 eventName = "stats_bar_chart_tapped";
                 break;
@@ -460,6 +454,15 @@ public void refreshMetadata(boolean isUserConnected, boolean isWordPressComUser,
             return;
         }
 
+        try {
+            JSONObject properties = new JSONObject();
+            properties.put(JETPACK_USER, isJetpackUser);
+            properties.put(NUMBER_OF_BLOGS, numBlogs);
+            mNosaraClient.registerUserProperties(properties);
+        } catch (JSONException e) {
+            AppLog.e(AppLog.T.UTILS, e);
+        }
+
         if (isUserConnected && isWordPressComUser) {
             setWordPressComUserName(username);
             // Re-unify the user
@@ -475,14 +478,7 @@ public void refreshMetadata(boolean isUserConnected, boolean isWordPressComUser,
             }
         }
 
-        try {
-            JSONObject properties = new JSONObject();
-            properties.put(JETPACK_USER, isJetpackUser);
-            properties.put(NUMBER_OF_BLOGS, numBlogs);
-            mNosaraClient.registerUserProperties(properties);
-        } catch (JSONException e) {
-            AppLog.e(AppLog.T.UTILS, e);
-        }
+
     }