From 1a998f4bde04469d701f6a974f9fe2ef02c889b5 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 26 Aug 2021 10:41:53 +0200
Subject: [PATCH] Fixed no missed call notification if app was on call history
 fragment when it happened

---
 .../main/history/fragments/MasterCallLogsFragment.kt   |  6 +++---
 .../org/linphone/notifications/NotificationsManager.kt | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
index 5df82e216..d51eaf8e0 100644
--- a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
@@ -237,14 +237,14 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
         binding.setMissedCallLogsToggleClickListener {
             listViewModel.missedCallLogsSelected.value = true
         }
+
+        coreContext.core.resetMissedCallsCount()
+        coreContext.notificationsManager.dismissMissedCallNotification()
     }
 
     override fun onResume() {
         super.onResume()
 
-        coreContext.core.resetMissedCallsCount()
-        coreContext.notificationsManager.dismissMissedCallNotification()
-
         val tabsViewModel = requireActivity().run {
             ViewModelProvider(this).get(TabsViewModel::class.java)
         }
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 6f78bc176..7eb6673e3 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -123,7 +123,7 @@ class NotificationsManager(private val context: Context) {
                 Call.State.End, Call.State.Error -> dismissCallNotification(call)
                 Call.State.Released -> {
                     if (LinphoneUtils.isCallLogMissed(call.callLog)) {
-                        displayMissedCallNotification(call)
+                        displayMissedCallNotification(call.remoteAddress)
                     }
                 }
                 else -> displayCallNotification(call)
@@ -435,17 +435,17 @@ class NotificationsManager(private val context: Context) {
         }
     }
 
-    fun displayMissedCallNotification(call: Call) {
-        val missedCallCount: Int = call.core.missedCallsCount
+    private fun displayMissedCallNotification(remoteAddress: Address) {
+        val missedCallCount: Int = coreContext.core.missedCallsCount
         val body: String
         if (missedCallCount > 1) {
             body = context.getString(R.string.missed_calls_notification_body)
                 .format(missedCallCount)
             Log.i("[Notifications Manager] Updating missed calls notification count to $missedCallCount")
         } else {
-            val contact: Contact? = coreContext.contactsManager.findContactByAddress(call.remoteAddress)
+            val contact: Contact? = coreContext.contactsManager.findContactByAddress(remoteAddress)
             body = context.getString(R.string.missed_call_notification_body)
-                .format(contact?.fullName ?: LinphoneUtils.getDisplayName(call.remoteAddress))
+                .format(contact?.fullName ?: LinphoneUtils.getDisplayName(remoteAddress))
             Log.i("[Notifications Manager] Creating missed call notification")
         }