From bf1f2c31754664f45d441fbc146693de70a633bd Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 19 May 2022 16:20:00 +0200 Subject: [PATCH] Prevent call logs wrongly grouped due to conf-id parameter not used in equal comparison, cf RFC --- .../activities/main/history/viewmodels/CallLogsListViewModel.kt | 1 + 1 file changed, 1 insertion(+) 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 b96111489..081e8e1a7 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 @@ -117,6 +117,7 @@ class CallLogsListViewModel : ViewModel() { if (previousCallLogGroup == null) { previousCallLogGroup = GroupedCallLogData(callLog) } else if (!callLog.wasConference() && // Do not group conference call logs + callLog.wasConference() == previousCallLogGroup.lastCallLog.wasConference() && // Check that both are of the same type, if one has a conf-id and not the other the equal method will return true ! previousCallLogGroup.lastCallLog.localAddress.weakEqual(callLog.localAddress) && previousCallLogGroup.lastCallLog.remoteAddress.equal(callLog.remoteAddress) ) {