From b14f9990b49673b44364a1a6fe2f830cbd56c1f9 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Mon, 23 Mar 2020 14:16:26 +0100
Subject: [PATCH] Fix #761

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 app/build.gradle                                    |  4 ++--
 .../nextcloud/talk/controllers/ChatController.kt    | 13 +++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 420117aac..3297bc75c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,8 +39,8 @@ android {
         targetSdkVersion 28
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        versionCode 134
-        versionName "8.0.7"
+        versionCode 135
+        versionName "8.0.8"
 
         flavorDimensions "default"
         renderscriptTargetApi 19
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 792a202c6..7678bbae1 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -333,8 +333,6 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
     }
 
     override fun onViewBound(view: View) {
-        super.onViewBound(view)
-
         actionBar?.show()
         var adapterWasNull = false
 
@@ -465,7 +463,6 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
 
         if (currentConversation != null && currentConversation?.roomId != null) {
             loadAvatarForStatusBar()
-            checkLobbyState()
             setTitle()
         }
 
@@ -473,8 +470,11 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
             // we're starting
             if (TextUtils.isEmpty(roomToken)) {
                 handleFromNotification()
+            } else {
+                getRoomInfo()
             }
         }
+        super.onViewBound(view)
     }
 
 
@@ -541,13 +541,6 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
             lobbyView?.visibility = View.GONE
             messagesListView?.visibility = View.VISIBLE
             messageInput?.visibility = View.VISIBLE
-            if (isFirstMessagesProcessing && pastPreconditionFailed) {
-                pastPreconditionFailed = false
-                pullChatMessages(0)
-            } else if (futurePreconditionFailed) {
-                futurePreconditionFailed = false
-                pullChatMessages(1)
-            }
         }
     }