From aab9704d24c16573ae280d740ae21e4745029b20 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 1 Dec 2023 14:55:30 +0100
Subject: [PATCH] Added onAccountRemoved + fixed FAB background color + removed
 setFriendsDatabasePath that no longer exists

---
 app/build.gradle                                          | 2 +-
 app/src/main/java/org/linphone/core/CoreContext.kt        | 3 +--
 .../org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt | 8 ++++++++
 app/src/main/res/values-night/themes.xml                  | 3 ---
 app/src/main/res/values/themes.xml                        | 3 ---
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7e8c1152a..05ff555bb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -123,7 +123,7 @@ dependencies {
     android.defaultConfig.manifestPlaceholders = [appAuthRedirectScheme: 'org.linphone.sso']
 
     //noinspection GradleDynamicVersion
-    implementation 'org.linphone:linphone-sdk-android:5.3+'
+    implementation 'org.linphone:linphone-sdk-android:5.3.0-alpha+'
 }
 
 ktlint {
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index c9371e86b..3699a6348 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -180,8 +180,6 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C
         core.isAutoIterateEnabled = true
         core.addListener(coreListener)
 
-        core.friendsDatabasePath = corePreferences.friendsDatabasePath
-
         computeUserAgent()
 
         core.start()
@@ -193,6 +191,7 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C
         Looper.loop()
     }
 
+    @Deprecated("Deprecated in Java")
     @WorkerThread
     override fun destroy() {
         core.stop()
diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt
index 8f7acdf69..7f6024865 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt
@@ -82,6 +82,14 @@ class DrawerMenuViewModel @UiThread constructor() : ViewModel() {
             )
             computeAccountsList()
         }
+
+        @WorkerThread
+        override fun onAccountRemoved(core: Core, account: Account) {
+            Log.i(
+                "$TAG Account [${account.params.identityAddress?.asStringUriOnly()}] has been removed from the Core"
+            )
+            computeAccountsList()
+        }
     }
 
     init {
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index ee04ba422..50ba1ab74 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -6,9 +6,6 @@
     </style>
     <!-- Base application theme. -->
     <style name="Theme.Linphone" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/orange_main_500</item>
-        <item name="colorSurface">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@color/orange_main_500</item>
         <!-- https://developer.android.com/guide/topics/display-cutout#best_practices_for_display_cutout_support -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c32574862..bbe4286f9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -7,9 +7,6 @@
 
     <!-- Base application theme. -->
     <style name="Theme.Linphone" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/orange_main_500</item>
-        <item name="colorSurface">@color/white</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@color/orange_main_500</item>
         <!-- https://developer.android.com/guide/topics/display-cutout#best_practices_for_display_cutout_support -->