From 13544e5d39b8b322623723a5945c1aa12d652faa Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 24 Feb 2021 10:16:03 +0100
Subject: [PATCH] Fixed crashes

---
 .../chat/fragments/DetailChatRoomFragment.kt     | 16 +++++++++++-----
 .../activities/main/fragments/MasterFragment.kt  |  9 ++++++++-
 2 files changed, 19 insertions(+), 6 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 075b65d8a..73111abbc 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
@@ -78,8 +78,10 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
     }
 
     override fun onDestroyView() {
+        if (_adapter != null) {
+            adapter.unregisterAdapterDataObserver(observer)
+        }
         binding.chatMessagesList.adapter = null
-        adapter.unregisterAdapterDataObserver(observer)
         super.onDestroyView()
     }
 
@@ -325,10 +327,14 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
     override fun onResume() {
         super.onResume()
 
-        // Prevent notifications for this chat room to be displayed
-        val peerAddress = viewModel.chatRoom.peerAddress.asStringUriOnly()
-        coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = peerAddress
-        coreContext.notificationsManager.cancelChatNotificationIdForSipUri(peerAddress)
+        if (this::viewModel.isInitialized) {
+            // Prevent notifications for this chat room to be displayed
+            val peerAddress = viewModel.chatRoom.peerAddress.asStringUriOnly()
+            coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = peerAddress
+            coreContext.notificationsManager.cancelChatNotificationIdForSipUri(peerAddress)
+        } else {
+            Log.e("[Chat Room] Fragment resuming but viewModel lateinit property isn't initialized!")
+        }
     }
 
     override fun onPause() {
diff --git a/app/src/main/java/org/linphone/activities/main/fragments/MasterFragment.kt b/app/src/main/java/org/linphone/activities/main/fragments/MasterFragment.kt
index 3c0e8b914..23f7c91db 100644
--- a/app/src/main/java/org/linphone/activities/main/fragments/MasterFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/fragments/MasterFragment.kt
@@ -30,6 +30,7 @@ import org.linphone.LinphoneApplication
 import org.linphone.R
 import org.linphone.activities.main.viewmodels.DialogViewModel
 import org.linphone.activities.main.viewmodels.ListTopBarViewModel
+import org.linphone.core.tools.Log
 import org.linphone.utils.AppUtils
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.SelectionListAdapter
@@ -40,7 +41,13 @@ import org.linphone.utils.SelectionListAdapter
  */
 abstract class MasterFragment<T : ViewDataBinding, U : SelectionListAdapter<*, *>> : SecureFragment<T>() {
     protected var _adapter: U? = null
-    protected val adapter get() = _adapter!!
+    protected val adapter: U
+        get() {
+            if (_adapter == null) {
+                Log.e("[Master Fragment] Attempting to get a null adapter!")
+            }
+            return _adapter!!
+        }
 
     protected lateinit var listSelectionViewModel: ListTopBarViewModel
     protected open val dialogConfirmationMessageBeforeRemoval: Int = R.plurals.dialog_default_delete