From 7f6078737c0a5d1be00cc02369ae2955239714a6 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 6 Sep 2021 11:59:44 +0200
Subject: [PATCH] Wait until detail chat room fragment is ready before opening
 the sliding pane

---
 .../main/java/org/linphone/activities/Navigation.kt    |  1 -
 .../main/chat/fragments/DetailChatRoomFragment.kt      |  6 ++++++
 .../main/chat/fragments/MasterChatRoomsFragment.kt     | 10 ++++++++++
 .../activities/main/viewmodels/SharedMainViewModel.kt  |  4 ++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index 108c162f5..66842ccde 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -298,7 +298,6 @@ internal fun MasterChatRoomsFragment.navigateToChatRoom(
         args,
         computeSlidingPaneNavOptions(slidingPane, popUpToFragmentId, true)
     )
-    if (!slidingPane.isOpen) slidingPane.openPane()
 }
 
 internal fun MasterChatRoomsFragment.navigateToChatRoomCreation(
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index 35eb72db8..54b012e71 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -33,6 +33,7 @@ import android.view.View
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.appcompat.view.menu.MenuPopupHelper
 import androidx.core.content.FileProvider
+import androidx.core.view.doOnPreDraw
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
@@ -102,6 +103,11 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
         }
         binding.sharedMainViewModel = sharedViewModel
 
+        view.doOnPreDraw {
+            // Notifies fragment is ready to be drawn
+            sharedViewModel.chatRoomFragmentOpenedEvent.value = Event(true)
+        }
+
         val localSipUri = arguments?.getString("LocalSipUri")
         val remoteSipUri = arguments?.getString("RemoteSipUri")
 
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
index 729baeabf..d08437581 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
@@ -92,6 +92,16 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
 
         view.doOnPreDraw { sharedViewModel.canSlidingPaneBeClosed.value = binding.slidingPane.isSlideable }
 
+        // Chat room loading can take some time, so wait until it is ready before opening the pane
+        sharedViewModel.chatRoomFragmentOpenedEvent.observe(
+            viewLifecycleOwner,
+            {
+                it.consume {
+                    binding.slidingPane.openPane()
+                }
+            }
+        )
+
         sharedViewModel.closeSlidingPaneEvent.observe(
             viewLifecycleOwner,
             {
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
index 21733792d..c0be7e92e 100644
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/viewmodels/SharedMainViewModel.kt
@@ -39,6 +39,10 @@ class SharedMainViewModel : ViewModel() {
 
     /* Chat */
 
+    val chatRoomFragmentOpenedEvent: MutableLiveData<Event<Boolean>> by lazy {
+        MutableLiveData<Event<Boolean>>()
+    }
+
     val selectedChatRoom = MutableLiveData<ChatRoom>()
     var destructionPendingChatRoom: ChatRoom? = null