From 3020275725f00d8e2ba65215c290687414728a8a Mon Sep 17 00:00:00 2001
From: Florens Douwes <Floens@gmail.com>
Date: Sun, 10 Aug 2014 20:42:18 +0200
Subject: [PATCH] Check deleted only on threads Disable out-of-order fix

---
 .../chan/core/net/ChanReaderRequest.java      | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
index 5849738b..3e5e6a3c 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
@@ -31,8 +31,6 @@ import org.floens.chan.core.model.Post;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -99,17 +97,19 @@ public class ChanReaderRequest extends JsonReaderRequest<List<Post>> {
             totalList.addAll(cached);
 
             // If there's a cached post but it's not in the list received from the server, mark it as deleted
-            boolean serverHas;
-            for (Post cache : cached) {
-                serverHas = false;
-                for (Post b : serverList) {
-                    if (b.no == cache.no) {
-                        serverHas = true;
-                        break;
+            if (loadable.isThreadMode()) {
+                boolean serverHas;
+                for (Post cache : cached) {
+                    serverHas = false;
+                    for (Post b : serverList) {
+                        if (b.no == cache.no) {
+                            serverHas = true;
+                            break;
+                        }
                     }
-                }
 
-                cache.deleted = !serverHas;
+                    cache.deleted = !serverHas;
+                }
             }
 
             // If there's a post in the list from the server, that's not in the cached list, add it.
@@ -131,12 +131,14 @@ public class ChanReaderRequest extends JsonReaderRequest<List<Post>> {
             }
 
             // Sort if it got out of order due to posts disappearing/reappearing
-            Collections.sort(totalList, new Comparator<Post>() {
-                @Override
-                public int compare(Post lhs, Post rhs) {
-                    return lhs.time == rhs.time ? 0 : (lhs.time < rhs.time ? -1 : 1);
-                }
-            });
+            /*if (loadable.isThreadMode()) {
+                Collections.sort(totalList, new Comparator<Post>() {
+                    @Override
+                    public int compare(Post lhs, Post rhs) {
+                        return lhs.time == rhs.time ? 0 : (lhs.time < rhs.time ? -1 : 1);
+                    }
+                });
+            }*/
 
         } else {
             totalList.addAll(serverList);