From 917e764b6f4ef1f1f915f371cf57a5195e07324d Mon Sep 17 00:00:00 2001
From: wchen342 <wchen342@users.noreply.github.com>
Date: Mon, 27 Apr 2026 14:34:51 -0400
Subject: [PATCH] Promote call FGS asap (#4377)

* Promote call FGS as soon as possible

* Add resource strings for call notification

* Launch with only phone call type on 14+
---
 src/main/AndroidManifest.xml                  |  3 +-
 .../securesms/calls/CallCoordinator.java      | 26 ++++++++--
 .../securesms/calls/CallService.java          | 48 +++++++++++++++++--
 src/main/res/values/strings.xml               |  2 +
 4 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 191e1e81a..0e66c7835 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -71,6 +71,7 @@
         android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
 
@@ -490,7 +491,7 @@
             android:name=".calls.CallService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="camera|microphone" />
+            android:foregroundServiceType="camera|microphone|phoneCall" />
 
         <receiver
             android:name=".notifications.MarkReadReceiver"
diff --git a/src/main/java/org/thoughtcrime/securesms/calls/CallCoordinator.java b/src/main/java/org/thoughtcrime/securesms/calls/CallCoordinator.java
index 12336e4bb..283572f52 100644
--- a/src/main/java/org/thoughtcrime/securesms/calls/CallCoordinator.java
+++ b/src/main/java/org/thoughtcrime/securesms/calls/CallCoordinator.java
@@ -215,7 +215,8 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
                   calleeName = "Unknown";
                 }
 
-                showOrUpdateOngoingNotification("Calling " + calleeName + "...");
+                showOrUpdateOngoingNotification(
+                    appContext.getString(R.string.calling_person, calleeName));
               }
 
               // Initialize call
@@ -402,6 +403,15 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
       callService.stopRingtone();
     }
 
+    // Promote the service to foreground immediately. Waiting until onIncomingCallAccepted
+    // on executor pool thread is too late on stricter OEM.
+    //
+    // Do not cancel() but use showOrUpdateOngoingNotification to replace incoming
+    // notification without a gap.
+    String callerName = displayName.getValue();
+    if (callerName == null) callerName = "Unknown";
+    showOrUpdateOngoingNotification(appContext.getString(R.string.call_with, callerName));
+
     // Notify Android system with CallControlScope
     CallControlScope scope = activeCallControlScope;
     if (scope != null) {
@@ -425,8 +435,6 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
             }
           });
     }
-
-    notificationManager.cancel(NOTIFICATION_ID_CALL);
   }
 
   public void answerWebRTC() {
@@ -921,7 +929,7 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
       callerName = "Unknown";
     }
 
-    showOrUpdateOngoingNotification("Call with " + callerName);
+    showOrUpdateOngoingNotification(appContext.getString(R.string.call_with, callerName));
   }
 
   private synchronized void onCallAnsweredOnOtherDevice() {
@@ -1008,7 +1016,7 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
     if (calleeName == null) {
       calleeName = "Unknown";
     }
-    showOrUpdateOngoingNotification("Call with " + calleeName);
+    showOrUpdateOngoingNotification(appContext.getString(R.string.call_with, calleeName));
   }
 
   private synchronized void onCallEnded(int accId, int callId) {
@@ -1101,6 +1109,14 @@ public class CallCoordinator implements DcEventCenter.DcEventDelegate {
       return;
     }
 
+    if (callService != null) {
+      try {
+        callService.stopForegroundAndDismiss();
+      } catch (Exception e) {
+        Log.w(TAG, "stopForegroundAndDismiss failed", e);
+      }
+    }
+
     // Clear state
     this.activeAccId = null;
     this.activeCallId = null;
diff --git a/src/main/java/org/thoughtcrime/securesms/calls/CallService.java b/src/main/java/org/thoughtcrime/securesms/calls/CallService.java
index 83d945fcf..5972d470d 100644
--- a/src/main/java/org/thoughtcrime/securesms/calls/CallService.java
+++ b/src/main/java/org/thoughtcrime/securesms/calls/CallService.java
@@ -4,6 +4,7 @@ import android.app.Notification;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ServiceInfo;
 import android.media.AudioAttributes;
 import android.media.AudioFocusRequest;
 import android.media.AudioManager;
@@ -13,7 +14,9 @@ import android.media.ToneGenerator;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
+import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.util.Log;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
@@ -432,6 +435,12 @@ public class CallService extends Service implements WebRTCClient.Callbacks {
 
     disposeWebRTC();
 
+    try {
+      stopForeground(STOP_FOREGROUND_REMOVE);
+    } catch (Exception e) {
+      Log.w(TAG, "stopForeground failed", e);
+    }
+
     stopService();
   }
 
@@ -494,13 +503,44 @@ public class CallService extends Service implements WebRTCClient.Callbacks {
   // Foreground Notification
 
   public void startForegroundWithNotification(int id, Notification notification) {
-    Log.d(TAG, "Starting foreground with notification id: " + id);
-    startForeground(id, notification);
+    // Always run on main thread
+    if (Looper.myLooper() != Looper.getMainLooper()) {
+      new Handler(Looper.getMainLooper())
+          .post(() -> startForegroundWithNotification(id, notification));
+      return;
+    }
+
+    Log.d(TAG, "Starting call FGS with notification id: " + id);
+    try {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+        startForeground(id, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL);
+      } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        int types =
+            ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
+                | ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA;
+        startForeground(id, notification, types);
+      } else {
+        startForeground(id, notification);
+      }
+    } catch (Exception e) {
+      Log.e(TAG, "startForeground failed", e);
+      if (callCoordinator != null) {
+        callCoordinator.reportError("Failed to activate call FGS: " + e.getMessage());
+      }
+    }
   }
 
   public void stopForegroundAndDismiss() {
-    Log.d(TAG, "Stopping foreground and dismissing notification");
-    stopForeground(STOP_FOREGROUND_REMOVE);
+    if (Looper.myLooper() != Looper.getMainLooper()) {
+      new Handler(Looper.getMainLooper()).post(this::stopForegroundAndDismiss);
+      return;
+    }
+    Log.d(TAG, "Stopping call FGS and dismissing notification");
+    try {
+      stopForeground(STOP_FOREGROUND_REMOVE);
+    } catch (Exception e) {
+      Log.w(TAG, "stopForeground failed", e);
+    }
   }
 
   // Cleanup
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 2a032296f..0de5e12c6 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -430,6 +430,8 @@
     <string name="already_in_call">Already in a call</string>
     <string name="call_answered_elsewhere">Call answered on another device</string>
     <string name="call_requires_mic_permission">Microphone permission is required for calls</string>
+    <string name="call_with">Call with %1$s</string>
+    <string name="calling_person">Calling %1$s…</string>
 
     <!-- get confirmations -->
     <!-- confirmation for leaving groups or channels. If a subject is needed, "Are you sure you want to leave the chat?" would work as well -->