Publicize, Tags and Categories

14 files changed, 172 insertions, 70 deletions

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAbstractListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAbstractListFragment.java
index 45fc45aa1..17900b6d6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAbstractListFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAbstractListFragment.java
@@ -366,8 +366,7 @@ public abstract class StatsAbstractListFragment extends StatsAbstractFragment {
                     return; // already in single view
                 }
 
-                // Model cannot be null here
-                if (mDatamodels == null) {
+                if (!hasPreviousDataAvailable()) {
                     return;
                 }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java
index 4606b09b8..21919dccd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java
@@ -43,7 +43,7 @@ public class StatsAuthorsFragment extends StatsAbstractListFragment {
     }
 
     @SuppressWarnings("unused")
-    public void onEventMainThread(StatsEvents.AuthorsSectionUpdated event) {
+    public void onEventMainThread(StatsEvents.AuthorsUpdated event) {
         if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java
index aeb5ab19e..5be34fb94 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java
@@ -42,7 +42,7 @@ public class StatsClicksFragment extends StatsAbstractListFragment {
     }
 
     @SuppressWarnings("unused")
-    public void onEventMainThread(StatsEvents.ClicksSectionUpdated event) {
+    public void onEventMainThread(StatsEvents.ClicksUpdated event) {
         if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java
index 90341ccb7..22456ca53 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java
@@ -15,7 +15,6 @@ import org.wordpress.android.ui.stats.models.CommentFollowersModel;
 import org.wordpress.android.ui.stats.models.CommentsModel;
 import org.wordpress.android.ui.stats.models.FollowDataModel;
 import org.wordpress.android.ui.stats.models.PostModel;
-import org.wordpress.android.ui.stats.models.SearchTermsModel;
 import org.wordpress.android.ui.stats.service.StatsService;
 import org.wordpress.android.util.FormatUtils;
 import org.wordpress.android.util.GravatarUtils;
@@ -44,7 +43,6 @@ public class StatsCommentsFragment extends StatsAbstractListFragment {
         if (mCommentFollowersModel != null) {
             outState.putSerializable(ARG_REST_RESPONSE_FOLLOWERS, mCommentFollowersModel);
         }
-
     }
     @Override
     protected void restorePreviousData(Bundle savedInstanceState) {
@@ -57,7 +55,7 @@ public class StatsCommentsFragment extends StatsAbstractListFragment {
     }
 
     @SuppressWarnings("unused")
-    public void onEventMainThread(StatsEvents.CommentsSectionUpdated event) {
+    public void onEventMainThread(StatsEvents.CommentsUpdated event) {
         if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
@@ -67,7 +65,7 @@ public class StatsCommentsFragment extends StatsAbstractListFragment {
     }
 
     @SuppressWarnings("unused")
-    public void onEventMainThread(StatsEvents.CommentFollowersSectionUpdated event) {
+    public void onEventMainThread(StatsEvents.CommentFollowersUpdated event) {
         if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsEvents.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsEvents.java
index 46bf81645..673864947 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsEvents.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsEvents.java
@@ -7,8 +7,10 @@ import org.wordpress.android.ui.stats.models.ClicksModel;
 import org.wordpress.android.ui.stats.models.CommentFollowersModel;
 import org.wordpress.android.ui.stats.models.CommentsModel;
 import org.wordpress.android.ui.stats.models.GeoviewsModel;
+import org.wordpress.android.ui.stats.models.PublicizeModel;
 import org.wordpress.android.ui.stats.models.ReferrersModel;
 import org.wordpress.android.ui.stats.models.SearchTermsModel;
+import org.wordpress.android.ui.stats.models.TagsContainerModel;
 import org.wordpress.android.ui.stats.models.TopPostsAndPagesModel;
 import org.wordpress.android.ui.stats.models.VideoPlaysModel;
 import org.wordpress.android.ui.stats.models.VisitsModel;
@@ -66,117 +68,139 @@ public class StatsEvents {
         }
     }
 
-    public static class VisitorsAndViewsSectionUpdated extends SectionUpdatedAbstract {
+    public static class VisitorsAndViewsUpdated extends SectionUpdatedAbstract {
 
         public final VisitsModel mVisitsAndViews;
 
-        public VisitorsAndViewsSectionUpdated(String blogId, StatsTimeframe timeframe, String date,
-                                      final int maxResultsRequested, final int pageRequested, VisitsModel responseObjectModel) {
+        public VisitorsAndViewsUpdated(String blogId, StatsTimeframe timeframe, String date,
+                                       final int maxResultsRequested, final int pageRequested, VisitsModel responseObjectModel) {
             super(blogId, timeframe, date, maxResultsRequested, pageRequested);
             mVisitsAndViews = responseObjectModel;
         }
     }
 
-    public static class TopPostsSectionUpdated extends SectionUpdatedAbstract {
+    public static class TopPostsUpdated extends SectionUpdatedAbstract {
 
         public final TopPostsAndPagesModel mTopPostsAndPagesModel;
 
-        public TopPostsSectionUpdated(String blogId, StatsTimeframe timeframe, String date,
-                                      final int maxResultsRequested, final int pageRequested, TopPostsAndPagesModel responseObjectModel) {
+        public TopPostsUpdated(String blogId, StatsTimeframe timeframe, String date,
+                               final int maxResultsRequested, final int pageRequested, TopPostsAndPagesModel responseObjectModel) {
             super(blogId, timeframe, date, maxResultsRequested, pageRequested);
             mTopPostsAndPagesModel = responseObjectModel;
         }
     }
 
-    public static class ReferrersSectionUpdated extends SectionUpdatedAbstract {
+    public static class ReferrersUpdated extends SectionUpdatedAbstract {
 
         public final ReferrersModel mReferrers;
 
-        public ReferrersSectionUpdated(String blogId, StatsTimeframe timeframe, String date,
-                                      final int maxResultsRequested, final int pageRequested, ReferrersModel responseObjectModel) {
+        public ReferrersUpdated(String blogId, StatsTimeframe timeframe, String date,
+                                final int maxResultsRequested, final int pageRequested, ReferrersModel responseObjectModel) {
             super(blogId, timeframe, date, maxResultsRequested, pageRequested);
             mReferrers = responseObjectModel;
         }
     }
 
-    public static class ClicksSectionUpdated extends SectionUpdatedAbstract {
+    public static class ClicksUpdated extends SectionUpdatedAbstract {
 
         public final ClicksModel mClicks;
 
-        public ClicksSectionUpdated(String blogId, StatsTimeframe timeframe, String date,
-                                       final int maxResultsRequested, final int pageRequested, ClicksModel responseObjectModel) {
+        public ClicksUpdated(String blogId, StatsTimeframe timeframe, String date,
+                             final int maxResultsRequested, final int pageRequested, ClicksModel responseObjectModel) {
             super(blogId, timeframe, date, maxResultsRequested, pageRequested);
             mClicks = responseObjectModel;
         }
     }
 
 
-    public static class AuthorsSectionUpdated extends SectionUpdatedAbstract {
+    public static class AuthorsUpdated extends SectionUpdatedAbstract {
 
         public final AuthorsModel mAuthors;
 
-        public AuthorsSectionUpdated(String blogId, StatsTimeframe timeframe, String date,
-                                    final int maxResultsRequested, final int pageRequested, AuthorsModel responseObjectModel) {
+        public AuthorsUpdated(String blogId, StatsTimeframe timeframe, String date,
+                              final int maxResultsRequested, final int pageRequested, AuthorsModel responseObjectModel) {
             super(blogId, timeframe, date, maxResultsRequested, pageRequested);
             mAuthors = responseObjectModel;
         }
     }
 
-    public static class CountrySectionUpdated extends SectionUpdatedAbstract {
+    public static class CountriesUpdated extends SectionUpdatedAbstract {
 
         public final GeoviewsModel mCountries;
 
-        public CountrySectionUpdated(String blogId, StatsTimeframe timeframe, String date,
-                                     final int maxResultsRequested, final int pageRequested, GeoviewsModel responseObjectModel) {
+        public CountriesUpdated(String blogId, StatsTimeframe timeframe, String date,
+                                final int maxResultsRequested, final int pageRequested, GeoviewsModel responseObjectModel) {
             super(blogId, timeframe, date, maxResultsRequested, pageRequested);
             mCountries = responseObjectModel;
         }
     }
 
-    public static class VideoSectionUpdated extends SectionUpdatedAbstract {
+    public static class VideoPlaysUpdated extends SectionUpdatedAbstract {
 
         public final VideoPlaysModel mVideos;
 
-        public VideoSectionUpdated(String blogId, StatsTimeframe timeframe, String date,
-                                     final int maxResultsRequested, final int pageRequested, VideoPlaysModel responseObjectModel) {
+        public VideoPlaysUpdated(String blogId, StatsTimeframe timeframe, String date,
+                                 final int maxResultsRequested, final int pageRequested, VideoPlaysModel responseObjectModel) {
             super(blogId, timeframe, date, maxResultsRequested, pageRequested);
             mVideos = responseObjectModel;
         }
     }
 
-    public static class SearchTermsSectionUpdated extends SectionUpdatedAbstract {
+    public static class SearchTermsUpdated extends SectionUpdatedAbstract {
 
         public final SearchTermsModel mSearchTerms;
 
-        public SearchTermsSectionUpdated(String blogId, StatsTimeframe timeframe, String date,
-                                   final int maxResultsRequested, final int pageRequested, SearchTermsModel responseObjectModel) {
+        public SearchTermsUpdated(String blogId, StatsTimeframe timeframe, String date,
+                                  final int maxResultsRequested, final int pageRequested, SearchTermsModel responseObjectModel) {
             super(blogId, timeframe, date, maxResultsRequested, pageRequested);
             mSearchTerms = responseObjectModel;
         }
     }
 
-    public static class CommentsSectionUpdated extends SectionUpdatedAbstract {
+    public static class CommentsUpdated extends SectionUpdatedAbstract {
 
         public final CommentsModel mComments;
 
-        public CommentsSectionUpdated(String blogId, StatsTimeframe timeframe, String date,
-                                         final int maxResultsRequested, final int pageRequested, CommentsModel responseObjectModel) {
+        public CommentsUpdated(String blogId, StatsTimeframe timeframe, String date,
+                               final int maxResultsRequested, final int pageRequested, CommentsModel responseObjectModel) {
             super(blogId, timeframe, date, maxResultsRequested, pageRequested);
             mComments = responseObjectModel;
         }
     }
 
-    public static class CommentFollowersSectionUpdated extends SectionUpdatedAbstract {
+    public static class CommentFollowersUpdated extends SectionUpdatedAbstract {
 
         public final CommentFollowersModel mCommentFollowers;
 
-        public CommentFollowersSectionUpdated(String blogId, StatsTimeframe timeframe, String date,
-                                      final int maxResultsRequested, final int pageRequested, CommentFollowersModel responseObjectModel) {
+        public CommentFollowersUpdated(String blogId, StatsTimeframe timeframe, String date,
+                                       final int maxResultsRequested, final int pageRequested, CommentFollowersModel responseObjectModel) {
             super(blogId, timeframe, date, maxResultsRequested, pageRequested);
             mCommentFollowers = responseObjectModel;
         }
     }
 
+    public static class TagsUpdated extends SectionUpdatedAbstract {
+
+        public final TagsContainerModel mTagsContainer;
+
+        public TagsUpdated(String blogId, StatsTimeframe timeframe, String date,
+                                              final int maxResultsRequested, final int pageRequested, TagsContainerModel responseObjectModel) {
+            super(blogId, timeframe, date, maxResultsRequested, pageRequested);
+            mTagsContainer = responseObjectModel;
+        }
+    }
+
+    public static class PublicizeUpdated extends SectionUpdatedAbstract {
+
+        public final PublicizeModel mPublicizeModel;
+
+        public PublicizeUpdated(String blogId, StatsTimeframe timeframe, String date,
+                           final int maxResultsRequested, final int pageRequested, PublicizeModel responseObjectModel) {
+            super(blogId, timeframe, date, maxResultsRequested, pageRequested);
+            mPublicizeModel = responseObjectModel;
+        }
+    }
+
     public static class JetpackSettingsCompleted {
         public final boolean isError;
         public JetpackSettingsCompleted(boolean isError) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsGeoviewsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsGeoviewsFragment.java
index e98506f0e..8dbbfa149 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsGeoviewsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsGeoviewsFragment.java
@@ -50,7 +50,7 @@ public class StatsGeoviewsFragment extends StatsAbstractListFragment {
     }
 
     @SuppressWarnings("unused")
-    public void onEventMainThread(StatsEvents.CountrySectionUpdated event) {
+    public void onEventMainThread(StatsEvents.CountriesUpdated event) {
         if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsPublicizeFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsPublicizeFragment.java
index da888eda9..5b2bbb0f8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsPublicizeFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsPublicizeFragment.java
@@ -1,6 +1,7 @@
 package org.wordpress.android.ui.stats;
 
 import android.app.Activity;
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,6 +10,7 @@ import android.widget.ArrayAdapter;
 import org.wordpress.android.R;
 import org.wordpress.android.ui.stats.models.PublicizeModel;
 import org.wordpress.android.ui.stats.models.SingleItemModel;
+import org.wordpress.android.ui.stats.models.TagsContainerModel;
 import org.wordpress.android.ui.stats.service.StatsService;
 import org.wordpress.android.util.FormatUtils;
 import org.wordpress.android.util.GravatarUtils;
@@ -21,14 +23,48 @@ import java.util.List;
 public class StatsPublicizeFragment extends StatsAbstractListFragment {
     public static final String TAG = StatsPublicizeFragment.class.getSimpleName();
 
+    private PublicizeModel mPublicizeData;
+
     @Override
-    protected void updateUI() {
-        if (!isAdded()) {
+    protected boolean hasPreviousDataAvailable() {
+        return mPublicizeData != null;
+    }
+    @Override
+    protected void savePreviousData(Bundle outState) {
+        if (mPublicizeData != null) {
+            outState.putSerializable(ARG_REST_RESPONSE, mPublicizeData);
+        }
+    }
+    @Override
+    protected void restorePreviousData(Bundle savedInstanceState) {
+        if (savedInstanceState.containsKey(ARG_REST_RESPONSE)) {
+            mPublicizeData = (PublicizeModel) savedInstanceState.getSerializable(ARG_REST_RESPONSE);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    public void onEventMainThread(StatsEvents.PublicizeUpdated event) {
+        if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
 
-        if (isErrorResponse()) {
-            showErrorUI();
+        mPublicizeData = event.mPublicizeModel;
+        updateUI();
+    }
+
+    @SuppressWarnings("unused")
+    public void onEventMainThread(StatsEvents.SectionUpdateError event) {
+        if (!shouldUpdateFragmentOnErrorEvent(event)) {
+            return;
+        }
+
+        mPublicizeData = null;
+        showErrorUI(event.mError);
+    }
+
+    @Override
+    protected void updateUI() {
+        if (!isAdded()) {
             return;
         }
 
@@ -42,16 +78,16 @@ public class StatsPublicizeFragment extends StatsAbstractListFragment {
     }
 
     private boolean hasPublicize() {
-        return !isDataEmpty()
-                && ((PublicizeModel) mDatamodels[0]).getServices() != null
-                && ((PublicizeModel) mDatamodels[0]).getServices().size() > 0;
+        return mPublicizeData != null
+                && mPublicizeData.getServices() != null
+                && mPublicizeData.getServices().size() > 0;
     }
 
     private List<SingleItemModel> getPublicize() {
         if (!hasPublicize()) {
             return null;
         }
-        return ((PublicizeModel) mDatamodels[0]).getServices();
+        return mPublicizeData.getServices();
     }
 
     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java
index 90d6f0f0b..0300f60c4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java
@@ -44,7 +44,7 @@ public class StatsReferrersFragment extends StatsAbstractListFragment {
     }
 
     @SuppressWarnings("unused")
-    public void onEventMainThread(StatsEvents.ReferrersSectionUpdated event) {
+    public void onEventMainThread(StatsEvents.ReferrersUpdated event) {
         if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java
index e6481cdeb..0a744c4d8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java
@@ -42,7 +42,7 @@ public class StatsSearchTermsFragment extends StatsAbstractListFragment {
     }
 
     @SuppressWarnings("unused")
-    public void onEventMainThread(StatsEvents.SearchTermsSectionUpdated event) {
+    public void onEventMainThread(StatsEvents.SearchTermsUpdated event) {
         if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java
index b24f861f3..d32bff5a1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java
@@ -1,6 +1,7 @@
 package org.wordpress.android.ui.stats;
 
 import android.content.Context;
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,14 +21,50 @@ import java.util.List;
 public class StatsTagsAndCategoriesFragment extends StatsAbstractListFragment {
     public static final String TAG = StatsTagsAndCategoriesFragment.class.getSimpleName();
 
+    private TagsContainerModel mTagsContainer;
+
     @Override
-    protected void updateUI() {
-        if (!isAdded()) {
+    protected boolean hasPreviousDataAvailable() {
+        return mTagsContainer != null;
+    }
+    @Override
+    protected void savePreviousData(Bundle outState) {
+        if (mTagsContainer != null) {
+            outState.putSerializable(ARG_REST_RESPONSE, mTagsContainer);
+        }
+    }
+    @Override
+    protected void restorePreviousData(Bundle savedInstanceState) {
+        if (savedInstanceState.containsKey(ARG_REST_RESPONSE)) {
+            mTagsContainer = (TagsContainerModel) savedInstanceState.getSerializable(ARG_REST_RESPONSE);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    public void onEventMainThread(StatsEvents.TagsUpdated event) {
+        if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
 
-        if (isErrorResponse()) {
-            showErrorUI();
+        mTagsContainer = event.mTagsContainer;
+        mGroupIdToExpandedMap.clear();
+        updateUI();
+    }
+
+    @SuppressWarnings("unused")
+    public void onEventMainThread(StatsEvents.SectionUpdateError event) {
+        if (!shouldUpdateFragmentOnErrorEvent(event)) {
+            return;
+        }
+
+        mTagsContainer = null;
+        mGroupIdToExpandedMap.clear();
+        showErrorUI(event.mError);
+    }
+
+    @Override
+    protected void updateUI() {
+        if (!isAdded()) {
             return;
         }
 
@@ -41,16 +78,16 @@ public class StatsTagsAndCategoriesFragment extends StatsAbstractListFragment {
     }
 
     private boolean hasTags() {
-        return !isDataEmpty()
-                && ((TagsContainerModel) mDatamodels[0]).getTags() != null
-                && (((TagsContainerModel) mDatamodels[0]).getTags()).size() > 0;
+        return mTagsContainer != null
+                && mTagsContainer.getTags() != null
+                && mTagsContainer.getTags().size() > 0;
     }
 
     private List<TagsModel> getTags() {
         if (!hasTags()) {
             return new ArrayList<TagsModel>(0);
         }
-        return ((TagsContainerModel) mDatamodels[0]).getTags();
+        return mTagsContainer.getTags();
     }
 
     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTopPostsAndPagesFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTopPostsAndPagesFragment.java
index 83da77105..3b0383d31 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTopPostsAndPagesFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTopPostsAndPagesFragment.java
@@ -36,7 +36,7 @@ public class StatsTopPostsAndPagesFragment extends StatsAbstractListFragment {
     }
 
     @SuppressWarnings("unused")
-    public void onEventMainThread(StatsEvents.TopPostsSectionUpdated event) {
+    public void onEventMainThread(StatsEvents.TopPostsUpdated event) {
         if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVideoplaysFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVideoplaysFragment.java
index f80d4a92a..e0b7d6f0c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVideoplaysFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVideoplaysFragment.java
@@ -40,7 +40,7 @@ public class StatsVideoplaysFragment extends StatsAbstractListFragment {
     }
 
     @SuppressWarnings("unused")
-    public void onEventMainThread(StatsEvents.VideoSectionUpdated event) {
+    public void onEventMainThread(StatsEvents.VideoPlaysUpdated event) {
         if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java
index ef17558ab..61ea8a9f4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java
@@ -722,7 +722,7 @@ public class StatsVisitorsAndViewsFragment extends StatsAbstractFragment
     }
 
     @SuppressWarnings("unused")
-    public void onEventMainThread(StatsEvents.VisitorsAndViewsSectionUpdated event) {
+    public void onEventMainThread(StatsEvents.VisitorsAndViewsUpdated event) {
         if (!shouldUpdateFragmentOnUpdateEvent(event)) {
             return;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/service/StatsService.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/service/StatsService.java
index 42d94fa1e..0a2f3ee32 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/service/StatsService.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/service/StatsService.java
@@ -26,8 +26,10 @@ import org.wordpress.android.ui.stats.models.ClicksModel;
 import org.wordpress.android.ui.stats.models.CommentFollowersModel;
 import org.wordpress.android.ui.stats.models.CommentsModel;
 import org.wordpress.android.ui.stats.models.GeoviewsModel;
+import org.wordpress.android.ui.stats.models.PublicizeModel;
 import org.wordpress.android.ui.stats.models.ReferrersModel;
 import org.wordpress.android.ui.stats.models.SearchTermsModel;
+import org.wordpress.android.ui.stats.models.TagsContainerModel;
 import org.wordpress.android.ui.stats.models.TopPostsAndPagesModel;
 import org.wordpress.android.ui.stats.models.VideoPlaysModel;
 import org.wordpress.android.ui.stats.models.VisitModel;
@@ -132,35 +134,41 @@ public class StatsService extends Service {
                                final int maxResultsRequested, final int pageRequested, final BaseStatsModel data) {
             switch (this) {
                 case VISITS:
-                    return new StatsEvents.VisitorsAndViewsSectionUpdated(blogId, timeframe, date,
+                    return new StatsEvents.VisitorsAndViewsUpdated(blogId, timeframe, date,
                             maxResultsRequested, pageRequested, (VisitsModel)data);
                 case TOP_POSTS:
-                    return new StatsEvents.TopPostsSectionUpdated(blogId, timeframe, date,
+                    return new StatsEvents.TopPostsUpdated(blogId, timeframe, date,
                             maxResultsRequested, pageRequested, (TopPostsAndPagesModel)data);
                 case REFERRERS:
-                    return new StatsEvents.ReferrersSectionUpdated(blogId, timeframe, date,
+                    return new StatsEvents.ReferrersUpdated(blogId, timeframe, date,
                             maxResultsRequested, pageRequested, (ReferrersModel)data);
                 case CLICKS:
-                    return new StatsEvents.ClicksSectionUpdated(blogId, timeframe, date,
+                    return new StatsEvents.ClicksUpdated(blogId, timeframe, date,
                             maxResultsRequested, pageRequested, (ClicksModel)data);
                 case AUTHORS:
-                    return new StatsEvents.AuthorsSectionUpdated(blogId, timeframe, date,
+                    return new StatsEvents.AuthorsUpdated(blogId, timeframe, date,
                             maxResultsRequested, pageRequested, (AuthorsModel)data);
                 case GEO_VIEWS:
-                    return new StatsEvents.CountrySectionUpdated(blogId, timeframe, date,
+                    return new StatsEvents.CountriesUpdated(blogId, timeframe, date,
                             maxResultsRequested, pageRequested, (GeoviewsModel)data);
                 case VIDEO_PLAYS:
-                    return new StatsEvents.VideoSectionUpdated(blogId, timeframe, date,
+                    return new StatsEvents.VideoPlaysUpdated(blogId, timeframe, date,
                             maxResultsRequested, pageRequested, (VideoPlaysModel)data);
                 case SEARCH_TERMS:
-                    return new StatsEvents.SearchTermsSectionUpdated(blogId, timeframe, date,
+                    return new StatsEvents.SearchTermsUpdated(blogId, timeframe, date,
                             maxResultsRequested, pageRequested, (SearchTermsModel)data);
                 case COMMENTS:
-                    return new StatsEvents.CommentsSectionUpdated(blogId, timeframe, date,
+                    return new StatsEvents.CommentsUpdated(blogId, timeframe, date,
                             maxResultsRequested, pageRequested, (CommentsModel)data);
                 case COMMENT_FOLLOWERS:
-                    return new StatsEvents.CommentFollowersSectionUpdated(blogId, timeframe, date,
+                    return new StatsEvents.CommentFollowersUpdated(blogId, timeframe, date,
                             maxResultsRequested, pageRequested, (CommentFollowersModel)data);
+                case TAGS_AND_CATEGORIES:
+                    return new StatsEvents.TagsUpdated(blogId, timeframe, date,
+                            maxResultsRequested, pageRequested, (TagsContainerModel)data);
+                case PUBLICIZE:
+                    return new StatsEvents.PublicizeUpdated(blogId, timeframe, date,
+                            maxResultsRequested, pageRequested, (PublicizeModel)data);
                 default:
                     return new StatsEvents.SectionUpdated(this, blogId, timeframe, date,
                             maxResultsRequested, pageRequested, data);