From 98f6206e752e01e2c85c5f61ef1afb3d77392463 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 11 Apr 2023 08:34:47 +0200
Subject: [PATCH] Another fix related to callLogs crash reported on the Play
 Store

---
 .../activities/main/history/adapters/CallLogsListAdapter.kt | 6 +++---
 .../activities/main/history/data/GroupedCallLogData.kt      | 2 ++
 .../main/history/viewmodels/CallLogsListViewModel.kt        | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
index 254843e25..0e935aa77 100644
--- a/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
@@ -110,17 +110,17 @@ class CallLogsListAdapter(
     override fun displayHeaderForPosition(position: Int): Boolean {
         if (position >= itemCount) return false
         val callLogGroup = getItem(position)
-        val date = callLogGroup.lastCallLog.startDate
+        val date = callLogGroup.lastCallLogStartTimestamp
         val previousPosition = position - 1
         return if (previousPosition >= 0) {
-            val previousItemDate = getItem(previousPosition).lastCallLog.startDate
+            val previousItemDate = getItem(previousPosition).lastCallLogStartTimestamp
             !TimestampUtils.isSameDay(date, previousItemDate)
         } else true
     }
 
     override fun getHeaderViewForPosition(context: Context, position: Int): View {
         val callLog = getItem(position)
-        val date = formatDate(context, callLog.lastCallLog.startDate)
+        val date = formatDate(context, callLog.lastCallLogStartTimestamp)
         val binding: GenericListHeaderBinding = DataBindingUtil.inflate(
             LayoutInflater.from(context),
             R.layout.generic_list_header, null, false
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 81aece431..3fa709f43 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,6 +27,7 @@ class GroupedCallLogData(callLog: CallLog) {
 
     var lastCallLog: CallLog = callLog
     var lastCallLogId: String? = callLog.callId
+    var lastCallLogStartTimestamp: Long = callLog.startDate
     val lastCallLogViewModel: CallLogViewModel
         get() {
             if (::_lastCallLogViewModel.isInitialized) {
@@ -47,5 +48,6 @@ class GroupedCallLogData(callLog: CallLog) {
     fun updateLastCallLog(callLog: CallLog) {
         lastCallLog = callLog
         lastCallLogId = callLog.callId
+        lastCallLogStartTimestamp = callLog.startDate
     }
 }
diff --git a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogsListViewModel.kt
index 0d63a47f7..4ca463a92 100644
--- a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogsListViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogsListViewModel.kt
@@ -122,7 +122,7 @@ class CallLogsListViewModel : ViewModel() {
                     previousCallLogGroup.lastCallLog.remoteAddress.equal(callLog.remoteAddress)
                 ) {
                     if (TimestampUtils.isSameDay(
-                            previousCallLogGroup.lastCallLog.startDate,
+                            previousCallLogGroup.lastCallLogStartTimestamp,
                             callLog.startDate
                         )
                     ) {