From c4244804d8aceab503255e04792b664cb949e006 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 15 Feb 2023 13:26:54 +0100 Subject: [PATCH] Prevent crash when destroying GroupedCallLogData if lastCallLogViewModel wasn't created yet --- .../main/history/data/GroupedCallLogData.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/main/history/data/GroupedCallLogData.kt b/app/src/main/java/org/linphone/activities/main/history/data/GroupedCallLogData.kt index e00a9c5dd..522f759ec 100644 --- a/app/src/main/java/org/linphone/activities/main/history/data/GroupedCallLogData.kt +++ b/app/src/main/java/org/linphone/activities/main/history/data/GroupedCallLogData.kt @@ -27,10 +27,18 @@ class GroupedCallLogData(callLog: CallLog) { val callLogs = arrayListOf(callLog) val lastCallLogViewModel: CallLogViewModel get() { - return CallLogViewModel(lastCallLog) + if (::_lastCallLogViewModel.isInitialized) { + return _lastCallLogViewModel + } + _lastCallLogViewModel = CallLogViewModel(lastCallLog) + return _lastCallLogViewModel } + private lateinit var _lastCallLogViewModel: CallLogViewModel + fun destroy() { - lastCallLogViewModel.destroy() + if (::_lastCallLogViewModel.isInitialized) { + lastCallLogViewModel + } } }