From c63a8cf2fdc75c3cb1b8086c3fd753aa298eda62 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 20 Dec 2021 17:22:37 +0100
Subject: [PATCH] Reworked CoreContext order at startup

---
 app/src/main/java/org/linphone/core/CoreContext.kt     | 10 ++++++----
 .../org/linphone/notifications/NotificationsManager.kt |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 7d6d94093..2f96b6dc4 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -286,8 +286,6 @@ class CoreContext(val context: Context, coreConfig: Config) {
     fun start(isPush: Boolean = false) {
         Log.i("[Context] Starting")
 
-        notificationsManager.onCoreReady()
-
         core.addListener(listener)
 
         // CoreContext listener must be added first!
@@ -308,14 +306,18 @@ class CoreContext(val context: Context, coreConfig: Config) {
             core.enterBackground()
         }
 
-        core.start()
-
         configureCore()
 
+        core.start()
+
         initPhoneStateListener()
 
+        notificationsManager.onCoreReady()
+
         EmojiCompat.init(BundledEmojiCompatConfig(context))
         collator.strength = Collator.NO_DECOMPOSITION
+
+        Log.i("[Context] Started")
     }
 
     fun stop() {
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 0d33add8a..d82e59015 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -124,7 +124,7 @@ class NotificationsManager(private val context: Context) {
                 return
             }
 
-            when (state) {
+            when (call.state) {
                 Call.State.IncomingEarlyMedia, Call.State.IncomingReceived -> displayIncomingCallNotification(call)
                 Call.State.End, Call.State.Error -> dismissCallNotification(call)
                 Call.State.Released -> {