Merge pull request #957 from samrmur/fix-956

[FIX] Fixed Fragment Replacement in ChatRoomActivity

Merge pull request #957 from samrmur/fix-956
[FIX] Fixed Fragment Replacement in ChatRoomActivity
9670e641 · Filipe de Lima Brito · GitHub · 383b1383 · ee782e1e · 9670e641
Unverified Commit 9670e641 authored Mar 23, 2018 by Filipe de Lima Brito Committed by GitHub Mar 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

ChatRoomActivity.kt .../java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt +5 -3

No files found.
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt
@@ -86,9 +86,11 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
        isChatRoomSubscribed = intent.getBooleanExtra(INTENT_CHAT_IS_SUBSCRIBED, true)
-        addFragment("ChatRoomFragment", R.id.fragment_container) {
+        if (supportFragmentManager.findFragmentByTag("ChatRoomFragment") == null) {
-            newInstance(chatRoomId, chatRoomName, chatRoomType, isChatRoomReadOnly, chatRoomLastSeen,
+            addFragment("ChatRoomFragment", R.id.fragment_container) {
-                    isChatRoomSubscribed)
+                newInstance(chatRoomId, chatRoomName, chatRoomType, isChatRoomReadOnly, chatRoomLastSeen,
+                        isChatRoomSubscribed)
+            }
        }
    }