From c9fdbf6f9d81a3a4d86c1146d8256c2cd774790c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 3 Feb 2026 14:05:55 +0100
Subject: [PATCH] Fixed crash + prevent background mode from turning ON when
 doing a remote provisioning if an account is already configured

---
 CHANGELOG.md                                               | 1 +
 app/src/main/java/org/linphone/contacts/ContactsManager.kt | 5 +++++
 app/src/main/java/org/linphone/core/CoreContext.kt         | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bec5d0cac..54becd982 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@ Group changes to describe their impact on the project, as follows:
 - Updated password forgotten procedure, will use online account manager platform
 
 ### Fixed
+- Prevent crash & background mode from turning on when doing a remote provisioning if an account is already configured
 - Copy raw message content instead of modified one when it contains a participant mention ("@username")
 - Do not apply Crashlytics plugin if it's not enabled
 
diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
index 3335742f8..33a84344d 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
@@ -626,6 +626,11 @@ class ContactsManager
         Log.w("$TAG Core has been stopped")
         coroutineScope.cancel()
 
+        knownContactsAvatarsMap.clear()
+        unknownContactsAvatarsMap.clear()
+        conferenceAvatarMap.clear()
+        magicSearchMap.clear()
+
         core.removeListener(coreListener)
 
         for (list in core.friendsLists) {
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 66cb17ae9..df1418e88 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -519,7 +519,7 @@ class CoreContext
             Log.i(
                 "$TAG New account configured: [${account.params.identityAddress?.asStringUriOnly()}]"
             )
-            if (!core.isPushNotificationAvailable || !account.params.isPushNotificationAvailable) {
+            if (!account.params.isPushNotificationAvailable) {
                 if (!corePreferences.keepServiceAlive) {
                     Log.w(
                         "$TAG Newly added account (or the whole Core) doesn't support push notifications, enabling keep-alive foreground service..."