From 1f3c17b818cd1ac27ae4ce2f2d4f446a966fdb42 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 18 Nov 2021 16:11:35 +0100
Subject: [PATCH] Another attempt to fix blank chat screen

---
 .../chat/fragments/DetailChatRoomFragment.kt  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

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 8dff727e4..c18fb2f08 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
@@ -108,6 +108,16 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
         super.onDestroyView()
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        val chatRoom = sharedViewModel.selectedChatRoom.value
+        if (chatRoom != null) {
+            outState.putString("LocalSipUri", chatRoom.localAddress.asStringUriOnly())
+            outState.putString("RemoteSipUri", chatRoom.peerAddress.asStringUriOnly())
+            Log.i("[Chat Room] Saving current chat room local & remote addresses in save instance state")
+        }
+        super.onSaveInstanceState(outState)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -120,15 +130,18 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
 
         useMaterialSharedAxisXForwardAnimation = sharedViewModel.isSlidingPaneSlideable.value == false
 
-        val localSipUri = arguments?.getString("LocalSipUri")
-        val remoteSipUri = arguments?.getString("RemoteSipUri")
+        val localSipUri = arguments?.getString("LocalSipUri") ?: savedInstanceState?.getString("LocalSipUri")
+        val remoteSipUri = arguments?.getString("RemoteSipUri") ?: savedInstanceState?.getString("RemoteSipUri")
 
         val textToShare = arguments?.getString("TextToShare")
         val filesToShare = arguments?.getStringArrayList("FilesToShare")
 
+        if (remoteSipUri != null && arguments?.getString("RemoteSipUri") == null) {
+            Log.w("[Chat Room] Chat room will be restored from saved instance state")
+        }
         arguments?.clear()
         if (localSipUri != null && remoteSipUri != null) {
-            Log.i("[Chat Room] Found local [$localSipUri] & remote [$remoteSipUri] addresses in arguments")
+            Log.i("[Chat Room] Found local [$localSipUri] & remote [$remoteSipUri] addresses in arguments or saved instance state")
 
             val localAddress = Factory.instance().createAddress(localSipUri)
             val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)