From cd8785855d533b7b48a6112bd1f8d4c2f117ce90 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 30 Sep 2024 11:14:59 +0200
Subject: [PATCH] Fixed quit app when keep alive service is enabled

---
 app/src/main/java/org/linphone/core/CoreContext.kt          | 6 +++++-
 .../java/org/linphone/ui/main/help/fragment/HelpFragment.kt | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index fcecbf38f..ab44ebebc 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -777,7 +777,11 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C
             CoreKeepAliveThirdPartyAccountsService::class.java
         )
         Log.i("$TAG Starting Keep alive for third party accounts Service")
-        context.startService(serviceIntent)
+        try {
+            context.startService(serviceIntent)
+        } catch (e: Exception) {
+            Log.e("$TAG Failed to start keep alive service: $e")
+        }
     }
 
     @WorkerThread
diff --git a/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt b/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt
index 4c6cf8bf3..0668d6b42 100644
--- a/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt
@@ -75,13 +75,15 @@ class HelpFragment : GenericMainFragment() {
         }
 
         binding.setQuitClickListener {
+            coreContext.stopKeepAliveService()
+
             coreContext.postOnCoreThread {
                 Log.i("$TAG Stopping Core Context")
                 coreContext.quitSafely()
             }
 
             Log.i("$TAG Quitting app")
-            requireActivity().finishAffinity()
+            requireActivity().finishAndRemoveTask()
         }
 
         binding.setPrivacyPolicyClickListener {