wordpress-mobile · hypest · Oct 13, 2016 · Oct 7, 2016 · Oct 7, 2016 · Oct 7, 2016
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderEvents.java b/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;
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java
@@ -34,13 +34,13 @@
 import org.wordpress.android.ui.reader.actions.ReaderActions;
 import org.wordpress.android.ui.reader.actions.ReaderPostActions;
 import org.wordpress.android.ui.reader.models.ReaderBlogIdPostId;
-import org.wordpress.android.ui.reader.models.ReaderRelatedPost;
 import org.wordpress.android.ui.reader.models.ReaderRelatedPostList;
 import org.wordpress.android.ui.reader.utils.ReaderUtils;
 import org.wordpress.android.ui.reader.utils.ReaderVideoUtils;
 import org.wordpress.android.ui.reader.views.ReaderIconCountView;
 import org.wordpress.android.ui.reader.views.ReaderLikingUsersView;
 import org.wordpress.android.ui.reader.views.ReaderPostDetailHeaderView;
+import org.wordpress.android.ui.reader.views.ReaderRelatedPostsView;
 import org.wordpress.android.ui.reader.views.ReaderTagStrip;
 import org.wordpress.android.ui.reader.views.ReaderWebView;
 import org.wordpress.android.ui.reader.views.ReaderWebView.ReaderCustomViewListener;
@@ -51,14 +51,11 @@
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.DateTimeUtils;
-import org.wordpress.android.util.DisplayUtils;
 import org.wordpress.android.util.NetworkUtils;
-import org.wordpress.android.util.PhotonUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.UrlUtils;
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper;
 import org.wordpress.android.util.widgets.CustomSwipeRefreshLayout;
-import org.wordpress.android.widgets.WPNetworkImageView;
 import org.wordpress.android.widgets.WPScrollView;
 import org.wordpress.android.widgets.WPScrollView.ScrollDirectionListener;
 
@@ -413,8 +410,8 @@ private void replacePost(long blogId, long postId) {
 
         // hide views that would show info for the previous post - these will be re-displayed
         // with the correct info once the new post loads
-        getView().findViewById(R.id.container_related_posts).setVisibility(View.GONE);
-        getView().findViewById(R.id.text_related_posts_label).setVisibility(View.GONE);
+        getView().findViewById(R.id.related_posts_view_local).setVisibility(View.GONE);
+        getView().findViewById(R.id.related_posts_view_global).setVisibility(View.GONE);
 
         mLikingUsersView.setVisibility(View.GONE);
         mLikingUsersDivider.setVisibility(View.GONE);
@@ -441,67 +438,43 @@ private void requestRelatedPosts() {
     }
 
     /*
-     * related posts were retrieved, so show them
+     * related posts were retrieved
      */
     @SuppressWarnings("unused")
     public void onEventMainThread(ReaderEvents.RelatedPostsUpdated event) {
         if (!isAdded() || !hasPost()) return;
 
-        // make sure this is for the current post
-        if (event.getSourcePost().postId == mPost.postId && event.getSourcePost().blogId == mPost.blogId) {
-            showRelatedPosts(event.getRelatedPosts());
+        // make sure this event is for the current post
+        if (event.getSourcePostId() == mPost.postId && event.getSourceSiteId() == mPost.blogId) {
+            if (event.hasLocalRelatedPosts()) {
+                showRelatedPosts(event.getLocalRelatedPosts(), false);
+            }
+            if (event.hasGlobalRelatedPosts()) {
+                showRelatedPosts(event.getGlobalRelatedPosts(), true);
+            }
         }
     }
 
-    private void showRelatedPosts(@NonNull ReaderRelatedPostList relatedPosts) {
-        // locate the related posts container and remove any existing related post views
-        ViewGroup container = (ViewGroup) getView().findViewById(R.id.container_related_posts);
-        container.removeAllViews();
-
-        // add a separate view for each related post
-        LayoutInflater inflater = LayoutInflater.from(getActivity());
-        int imageSize = DisplayUtils.dpToPx(getActivity(), getResources().getDimensionPixelSize(R.dimen.reader_related_post_image_size));
-        for (int index = 0; index < relatedPosts.size(); index++) {
-            final ReaderRelatedPost relatedPost = relatedPosts.get(index);
-
-            View postView = inflater.inflate(R.layout.reader_related_post, container, false);
-            TextView txtTitle = (TextView) postView.findViewById(R.id.text_related_post_title);
-            TextView txtByline = (TextView) postView.findViewById(R.id.text_related_post_byline);
-            WPNetworkImageView imgFeatured = (WPNetworkImageView) postView.findViewById(R.id.image_related_post);
-
-            txtTitle.setText(relatedPost.getTitle());
-            txtByline.setText(relatedPost.getByline());
-
-            imgFeatured.setVisibility(relatedPost.hasFeaturedImage() ? View.VISIBLE : View.GONE);
-            if (relatedPost.hasFeaturedImage()) {
-                String imageUrl = PhotonUtils.getPhotonImageUrl(relatedPost.getFeaturedImage(), imageSize, imageSize);
-                imgFeatured.setImageUrl(imageUrl, WPNetworkImageView.ImageType.PHOTO_ROUNDED);
-                imgFeatured.setVisibility(View.VISIBLE);
-            }
-
-            // tapping this view should open the related post detail
-            postView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    showRelatedPostDetail(relatedPost.getBlogId(), relatedPost.getPostId());
-                }
-            });
-
-            container.addView(postView);
-
-            // add a divider below all but the last related post
-            if (index < relatedPosts.size() - 1) {
-                View dividerView = inflater.inflate(R.layout.reader_related_post_divider, container, false);
-                container.addView(dividerView);
+    /*
+     * show the passed list of related posts - can be either global (related posts from
+     * across wp.com) or local (related posts from the same site as the current post)
+     */
+    private void showRelatedPosts(@NonNull ReaderRelatedPostList relatedPosts, boolean isGlobal) {
+        // different container views for global/local related posts
+        int id = isGlobal ? R.id.related_posts_view_global : R.id.related_posts_view_local;
+        ReaderRelatedPostsView relatedPostsView = (ReaderRelatedPostsView) getView().findViewById(id);
+        relatedPostsView.showRelatedPosts(relatedPosts, mPost.getBlogName(), isGlobal);
+
+        // tapping a related posts should open the related post detail
+        relatedPostsView.setOnRelatedPostClickListener(new ReaderRelatedPostsView.OnRelatedPostClickListener() {
+            @Override
+            public void onRelatedPostClick(View v, long siteId, long postId) {
+                showRelatedPostDetail(siteId, postId);
             }
-        }
+        });
 
-        View label = getView().findViewById(R.id.text_related_posts_label);
-        if (label.getVisibility() != View.VISIBLE) {
-            AniUtils.fadeIn(label, AniUtils.Duration.MEDIUM);
-        }
-        if (container.getVisibility() != View.VISIBLE) {
-            AniUtils.fadeIn(container, AniUtils.Duration.MEDIUM);
+        if (relatedPostsView.getVisibility() != View.VISIBLE) {
+            AniUtils.fadeIn(relatedPostsView, AniUtils.Duration.MEDIUM);
         }
     }
 

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActions.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActions.java
@@ -11,18 +11,20 @@
 import com.android.volley.toolbox.StringRequest;
 import com.wordpress.rest.RestRequest;
 
+import org.json.JSONArray;
 import org.json.JSONObject;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.datasets.ReaderLikeTable;
 import org.wordpress.android.datasets.ReaderPostTable;
 import org.wordpress.android.datasets.ReaderUserTable;
 import org.wordpress.android.models.ReaderPost;
-import org.wordpress.android.models.ReaderPostList;
 import org.wordpress.android.models.ReaderUserIdList;
 import org.wordpress.android.models.ReaderUserList;
 import org.wordpress.android.ui.reader.ReaderEvents;
 import org.wordpress.android.ui.reader.actions.ReaderActions.UpdateResult;
 import org.wordpress.android.ui.reader.actions.ReaderActions.UpdateResultListener;
+import org.wordpress.android.ui.reader.models.ReaderRelatedPost;
+import org.wordpress.android.ui.reader.models.ReaderRelatedPostList;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.JSONUtils;
@@ -40,6 +42,8 @@ public class ReaderPostActions {
     private static final String TRACKING_REFERRER = "https://wordpress.com/";
     private static final Random mRandom = new Random();
 
+    private static final int NUM_RELATED_POSTS_TO_REQUEST = 2;
+
     private ReaderPostActions() {
         throw new AssertionError();
     }
@@ -340,7 +344,8 @@ public Map<String, String> getHeaders() throws AuthFailureError {
     }
 
     /*
-     * request posts related to the passed one
+     * request posts related to the passed one, endpoint returns a combined list of related posts
+     * posts from across wp.com and related posts from the same site as the passed post
      */
     public static void requestRelatedPosts(final ReaderPost sourcePost) {
         if (sourcePost == null) return;
@@ -360,20 +365,36 @@ public void onErrorResponse(VolleyError volleyError) {
             }
         };
 
-        String path = "/read/site/" + sourcePost.blogId + "/post/" + sourcePost.postId + "/related";
+        String path = "/read/site/" + sourcePost.blogId
+                + "/post/" + sourcePost.postId
+                + "/related"
+                + "?size_local=" + NUM_RELATED_POSTS_TO_REQUEST
+                + "&size_global=" + NUM_RELATED_POSTS_TO_REQUEST
+                + "&fields=" + ReaderRelatedPost.RELATED_POST_FIELDS;
         WordPress.getRestClientUtilsV1_2().get(path, null, null, listener, errorListener);
     }
 
-    private static void handleRelatedPostsResponse(final ReaderPost sourcePost, final JSONObject jsonObject) {
+    private static void handleRelatedPostsResponse(final ReaderPost sourcePost,
+                                                   final JSONObject jsonObject) {
         if (jsonObject == null) return;
 
         new Thread() {
             @Override
             public void run() {
-                ReaderPostList relatedPosts = ReaderPostList.fromJson(jsonObject);
-                if (relatedPosts != null && relatedPosts.size() > 0) {
-                    ReaderPostTable.addOrUpdatePosts(null, relatedPosts);
-                    EventBus.getDefault().post(new ReaderEvents.RelatedPostsUpdated(sourcePost, relatedPosts));
+                JSONArray jsonPosts = jsonObject.optJSONArray("posts");
+                if (jsonPosts != null) {
+                    ReaderRelatedPostList allRelatedPosts = ReaderRelatedPostList.fromJsonPosts(jsonPosts);
+                    // split into posts from the passed site (local) and from across wp.com (global)
+                    ReaderRelatedPostList localRelatedPosts = new ReaderRelatedPostList();
+                    ReaderRelatedPostList globalRelatedPosts = new ReaderRelatedPostList();
+                    for (ReaderRelatedPost relatedPost : allRelatedPosts) {
+                        if (relatedPost.getSiteId() == sourcePost.blogId) {
+                            localRelatedPosts.add(relatedPost);
+                        } else {
+                            globalRelatedPosts.add(relatedPost);
+                        }
+                    }
+                    EventBus.getDefault().post(new ReaderEvents.RelatedPostsUpdated(sourcePost, localRelatedPosts, globalRelatedPosts));
                 }
             }
         }.start();