From 91a23cb28673208cedf4cd27a23b61f58bd9a0c1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 3 Nov 2022 12:05:46 +0100
Subject: [PATCH] Should fix the remaining
 ForegroundServiceStartNotAllowedException

---
 app/src/main/AndroidManifest.xml                    |  4 ++++
 .../linphone/notifications/NotificationsManager.kt  | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1edbb750..02a022232 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -51,6 +51,10 @@
     (https://developer.android.com/guide/topics/connectivity/bluetooth/permissions) -->
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
+    <!-- Needed for foreground service
+    (https://developer.android.com/guide/components/foreground-services) -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+
     <application
         android:name=".LinphoneApplication"
         android:allowBackup="false"
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 5101b6b0d..445d65fb5 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -372,7 +372,18 @@ class NotificationsManager(private val context: Context) {
             Log.i("[Notifications Manager] Starting service as foreground using call notification [$notificationId]")
             try {
                 currentForegroundServiceNotificationId = notificationId
-                service?.startForeground(currentForegroundServiceNotificationId, callNotification)
+
+                val coreService = service
+                if (coreService != null) {
+                    Compatibility.startForegroundService(
+                        coreService,
+                        currentForegroundServiceNotificationId,
+                        callNotification
+                    )
+                } else {
+                    Log.w("[Notifications Manager] No Service found, can't start it as foreground")
+                    currentForegroundServiceNotificationId = 0
+                }
             } catch (e: Exception) {
                 Log.e("[Notifications Manager] Foreground service wasn't allowed! $e")
                 currentForegroundServiceNotificationId = 0