Reader Full Post Refresh Design Review

WordPress/src/main/java/org/wordpress/android/models/ReaderPost.java

@@ -243,9 +243,21 @@ private static void assignAuthorFromJson(ReaderPost post, JSONObject jsonAuthor)
 
         post.authorName = JSONUtils.getStringDecoded(jsonAuthor, "name");
         post.authorFirstName = JSONUtils.getStringDecoded(jsonAuthor, "first_name");
-        post.postAvatar = JSONUtils.getString(jsonAuthor, "avatar_URL");
         post.authorId = jsonAuthor.optLong("ID");
 
+        // v1.2 endpoint contains a "has_avatar" boolean which tells us whether the author
+        // has a valid avatar - if this field exists and is set to false, skip setting
+        // the avatar URL
+        boolean hasAvatar;
+        if (jsonAuthor.has("has_avatar")) {
+            hasAvatar = jsonAuthor.optBoolean("has_avatar");
+        } else {
+            hasAvatar = true;
+        }
+        if (hasAvatar) {
+            post.postAvatar = JSONUtils.getString(jsonAuthor, "avatar_URL");
+        }
+
         // site_URL doesn't exist for /sites/ endpoints, so get it from the author
         if (TextUtils.isEmpty(post.blogUrl)) {
             post.setBlogUrl(JSONUtils.getString(jsonAuthor, "URL"));
@@ -272,15 +284,18 @@ private static void assignTagsFromJson(ReaderPost post, JSONObject jsonTags) {
 
         while (it.hasNext()) {
             JSONObject jsonThisTag = jsonTags.optJSONObject(it.next());
+            String thisTagName = JSONUtils.getStringDecoded(jsonThisTag, "slug");
 
             // if the number of posts on this blog that use this tag is higher than previous,
             // set this as the most popular tag, and set the second most popular tag to
             // the current most popular tag
             int postCount = jsonThisTag.optInt("post_count");
             if (postCount > popularCount) {
                 nextMostPopularTag = mostPopularTag;
-                mostPopularTag = JSONUtils.getStringDecoded(jsonThisTag, "slug");
+                mostPopularTag = thisTagName;
                 popularCount = postCount;
+            } else if (nextMostPopularTag == null) {
+                nextMostPopularTag = thisTagName;
             }
         }
 
@@ -461,7 +476,7 @@ public void setPrimaryTag(String tagName) {
             this.primaryTag = StringUtils.notNullStr(tagName);
         }
     }
-    boolean hasPrimaryTag() {
+    public boolean hasPrimaryTag() {
         return !TextUtils.isEmpty(primaryTag);
     }
 
@@ -473,6 +488,9 @@ public void setSecondaryTag(String tagName) {
             this.secondaryTag = StringUtils.notNullStr(tagName);
         }
     }
+    public boolean hasSecondaryTag() {
+        return !TextUtils.isEmpty(secondaryTag);
+    }
 
     /*
      * attachments are stored as the actual JSON to avoid having a separate table for

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderEvents.java

@@ -3,7 +3,6 @@
 import android.support.annotation.NonNull;
 
 import org.wordpress.android.models.ReaderPost;
-import org.wordpress.android.models.ReaderPostList;
 import org.wordpress.android.models.ReaderTag;
 import org.wordpress.android.ui.reader.actions.ReaderActions;
 import org.wordpress.android.ui.reader.models.ReaderRelatedPostList;
@@ -119,17 +118,35 @@ public ReaderActions.UpdateResult getResult() {
     }
 
     public static class RelatedPostsUpdated {
-        private final ReaderPost mSourcePost;
-        private final ReaderRelatedPostList mRelatedPosts;
-        public RelatedPostsUpdated(@NonNull ReaderPost sourcePost, @NonNull ReaderPostList relatedPosts) {
-            mSourcePost = sourcePost;
-            mRelatedPosts = new ReaderRelatedPostList(relatedPosts);
-        }
-        public ReaderPost getSourcePost() {
-            return mSourcePost;
-        }
-        public ReaderRelatedPostList getRelatedPosts() {
-            return mRelatedPosts;
+        private final long mSourcePostId;
+        private final long mSourceSiteId;
+        private final ReaderRelatedPostList mLocalRelatedPosts;
+        private final ReaderRelatedPostList mGlobalRelatedPosts;
+        public RelatedPostsUpdated(@NonNull ReaderPost sourcePost,
+                                   @NonNull ReaderRelatedPostList localRelatedPosts,
+                                   @NonNull ReaderRelatedPostList globalRelatedPosts) {
+            mSourcePostId = sourcePost.postId;
+            mSourceSiteId = sourcePost.blogId;
+            mLocalRelatedPosts = localRelatedPosts;
+            mGlobalRelatedPosts = globalRelatedPosts;
+        }
+        public long getSourcePostId() {
+            return mSourcePostId;
+        }
+        public long getSourceSiteId() {
+            return mSourceSiteId;
+        }
+        public ReaderRelatedPostList getLocalRelatedPosts() {
+            return mLocalRelatedPosts;
+        }
+        public ReaderRelatedPostList getGlobalRelatedPosts() {
+            return mGlobalRelatedPosts;
+        }
+        public boolean hasLocalRelatedPosts() {
+            return mLocalRelatedPosts.size() > 0;
+        }
+        public boolean hasGlobalRelatedPosts() {
+            return mGlobalRelatedPosts.size() > 0;
         }
     }
 }