From 345035e93ae1e38c5e7e1274dbc8d1177add96ce Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Mon, 30 Sep 2019 14:53:35 +0200
Subject: [PATCH] Fixed issues with sending messages

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../talk/controllers/ChatController.kt          | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 01187fc18..b2e61f98e 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -229,7 +229,6 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
 
                         override fun onNext(roomOverall: RoomOverall) {
                             currentConversation = roomOverall.ocs.data
-
                             loadAvatarForStatusBar()
 
                             setTitle()
@@ -904,8 +903,8 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
         fieldMap["includeLastKnown"] = 0
 
         var timeout = 30
-        if (lookIntoFuture == 0 || !lookingIntoFuture) {
-            timeout = 0
+        if (!lookingIntoFuture) {
+            timeout = 0;
         }
 
         fieldMap["timeout"] = timeout
@@ -917,8 +916,6 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
                 globalLastKnownFutureMessageId = currentConversation!!.lastReadMessage
                 globalLastKnownPastMessageId = currentConversation!!.lastReadMessage
                 fieldMap["includeLastKnown"] = 1
-            } else {
-                return;
             }
         }
 
@@ -938,9 +935,7 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
         if (!wasDetached) {
             if (lookIntoFuture > 0) {
                 val finalTimeout = timeout
-                ncApi?.pullChatMessages(credentials, ApiUtils.getUrlForChat(conversationUser?.baseUrl,
-                        roomToken),
-                        fieldMap)
+                ncApi?.pullChatMessages(credentials, ApiUtils.getUrlForChat(conversationUser?.baseUrl, roomToken), fieldMap)
                         ?.subscribeOn(Schedulers.io())
                         ?.observeOn(AndroidSchedulers.mainThread())
                         ?.takeWhile { observable -> inConversation && !wasDetached }
@@ -950,7 +945,11 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
                             }
 
                             override fun onNext(response: Response<*>) {
-                                processMessages(response, true, finalTimeout)
+                                if (response.code() == 304) {
+                                    pullChatMessages(1)
+                                } else {
+                                    processMessages(response, true, finalTimeout)
+                                }
                             }
 
                             override fun onError(e: Throwable) {