From d7bb023019a7251c682a980af9f232abbaf98552 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Sun, 29 Jul 2018 21:11:24 +0200
Subject: [PATCH] Only pull if in chat

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../java/com/nextcloud/talk/controllers/ChatController.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index c4f1b8831..ccd708ecf 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/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);
             }
         } else if (response.code() == 304 && !isFromTheFuture) {
@@ -840,7 +840,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
             historyRead = true;
 
-            if (!lookingIntoFuture) {
+            if (!lookingIntoFuture && inChat) {
                 pullChatMessages(1);
             }
         }
@@ -848,7 +848,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
     @Override
     public void onLoadMore(int page, int totalItemsCount) {
-        if (!historyRead) {
+        if (!historyRead && inChat) {
             pullChatMessages(0);
         }
     }