From 72ae8f2e67c32fa1834b438a1840c31f0bf15f72 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 29 Nov 2021 11:43:40 +0100
Subject: [PATCH] Fixed crash if sharedViewModel has not been initialized when
 saving fragment instance state

---
 .../main/chat/fragments/DetailChatRoomFragment.kt  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 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 c18fb2f08..0a4cf8819 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
@@ -109,11 +109,15 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
     }
 
     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")
+        if (::sharedViewModel.isInitialized) {
+            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")
+            }
+        } else {
+            Log.w("[Chat Room] Can't save instance state, sharedViewModel hasn't been initialized yet")
         }
         super.onSaveInstanceState(outState)
     }