From 95f3d776dbe941bbaccc59c2b44407f068466ba0 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 14 Jul 2022 10:21:13 +0200 Subject: [PATCH] fix switching conversation titles This reverts a change from a24f49c7 Before a24f49c7 in onDestroy() the disposables were not disposed. Instead this was "only" done in onComplete() of leaveRoom(). See a24f49c#diff-6b47d0e9875a7f7d5c1e6b80feab998e92d29b0cda8ac9bbf427aab99e56d209R1827 Because with a24f49c7 was now executed in onDestroy() , the leaveRoom() method is not executed successfully because it's destroyed too early. This results in multiple calls of getRoomInfo() with different roomTokens. Signed-off-by: Marcel Hibbe --- .../main/java/com/nextcloud/talk/controllers/ChatController.kt | 1 - 1 file changed, 1 deletion(-) 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 fc15cad1d..d0f24beeb 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -1831,7 +1831,6 @@ class ChatController(args: Bundle) : adapter = null inConversation = false - disposables.dispose() } private fun joinRoomWithPassword() {