Browse Source

Few more fixes

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 5 years ago
parent
commit
a316739c9e

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

@@ -673,9 +673,14 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
         if (inConversation) {
             if (wasDetached && conversationUser.hasSpreedFeatureCapability("no-ping")) {
-                currentConversation.setSessionId("0");
-                wasDetached = false;
-                joinRoomWithPassword();
+                if (currentConversation != null) {
+                    currentConversation.setSessionId("0");
+                    wasDetached = false;
+                    joinRoomWithPassword();
+                } else {
+                    wasDetached = false;
+                    getRoomInfo();
+                }
             }
         }
     }