Преглед изворни кода

Only pull if in chat

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic пре 6 година
родитељ
комит
d7bb023019
1 измењених фајлова са 3 додато и 3 уклоњено
  1. 3 3
      app/src/main/java/com/nextcloud/talk/controllers/ChatController.java

+ 3 - 3
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java

@@ -825,7 +825,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
                 }
                 }
             }
             }
 
 
-            if (!lookingIntoFuture) {
+            if (!lookingIntoFuture && inChat) {
                 pullChatMessages(1);
                 pullChatMessages(1);
             }
             }
         } else if (response.code() == 304 && !isFromTheFuture) {
         } else if (response.code() == 304 && !isFromTheFuture) {
@@ -840,7 +840,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
 
             historyRead = true;
             historyRead = true;
 
 
-            if (!lookingIntoFuture) {
+            if (!lookingIntoFuture && inChat) {
                 pullChatMessages(1);
                 pullChatMessages(1);
             }
             }
         }
         }
@@ -848,7 +848,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
 
     @Override
     @Override
     public void onLoadMore(int page, int totalItemsCount) {
     public void onLoadMore(int page, int totalItemsCount) {
-        if (!historyRead) {
+        if (!historyRead && inChat) {
             pullChatMessages(0);
             pullChatMessages(0);
         }
         }
     }
     }