Remove duplicates from the server blogs list if local and remote doesn't match.

Remove duplicates from the server blogs list if local and remote doesn't match.
This is required because under obscure circumstances the server can return duplicates.
We could have modified the function isSameList to eliminate the length check, but it's better to keep it separate since we aim to remove this check as soon as possible.

Author: daniloercoli

WordPress/src/main/java/org/wordpress/android/ui/reader/services/update/ReaderUpdateLogic.java

@@ -14,6 +14,7 @@
 import org.wordpress.android.datasets.ReaderPostTable;
 import org.wordpress.android.datasets.ReaderTagTable;
 import org.wordpress.android.fluxc.store.AccountStore;
+import org.wordpress.android.models.ReaderBlog;
 import org.wordpress.android.models.ReaderBlogList;
 import org.wordpress.android.models.ReaderTag;
 import org.wordpress.android.models.ReaderTagList;
@@ -321,7 +322,13 @@ private void handleFollowedBlogsResponse(final JSONObject jsonObject) {
             public void run() {
                 ReaderBlogList serverBlogs = ReaderBlogList.fromJson(jsonObject);
                 ReaderBlogList localBlogs = ReaderBlogTable.getFollowedBlogs();
-
+                // Remove duplicates from the server blogs list only if local and remote  lists don't match.
+                if (serverBlogs.size() != localBlogs.size()) {
+                    // This is required because under rare circumstances the server can return duplicates.
+                    // We could have modified the function isSameList to eliminate the length check,
+                    // but it's better to keep it separate since we aim to remove this check as soon as possible.
+                    removeDuplicateFromServerResponse(serverBlogs);
+                }
                 if (!localBlogs.isSameList(serverBlogs)) {
                     // always update the list of followed blogs if there are *any* changes between
                     // server and local (including subscription count, description, etc.)
@@ -338,6 +345,20 @@ public void run() {
 
                 taskCompleted(UpdateTask.FOLLOWED_BLOGS);
             }
+            /* This method remove duplicate ReaderBlog from list. */
+            private void removeDuplicateFromServerResponse(ReaderBlogList serverBlogs) {
+                for (int i = 0; i < serverBlogs.size(); i++) {
+                    ReaderBlog outer = serverBlogs.get(i);
+                    for (int j = serverBlogs.size() - 1; j > i; j--) {
+                        ReaderBlog inner = serverBlogs.get(j);
+                        if (outer.blogId == inner.blogId) {
+                            // If the 'id' property is the same,
+                            // remove the later object to avoid duplicates
+                            serverBlogs.remove(j);
+                        }
+                    }
+                }
+            }
         }.start();
     }
 }