react-native-notify-kit 10.4.6 → 10.4.7

package/android/src/main/java/app/notifee/core/ForegroundService.java

@@ -429,6 +429,33 @@ public class ForegroundService extends Service {
     }
   }
 
+  @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+  private static int selectDefensiveForegroundServiceType(int declaredTypes) {
+    int[] preferredTypes = {
+      ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE,
+      ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC,
+      ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK,
+      ServiceInfo.FOREGROUND_SERVICE_TYPE_REMOTE_MESSAGING
+    };
+
+    for (int type : preferredTypes) {
+      if (isDeclared(declaredTypes, type)) {
+        return type;
+      }
+    }
+
+    return declaredTypes;
+  }
+
+  private static boolean isDeclared(int declaredTypes, int type) {
+    return (declaredTypes & type) == type;
+  }
+
+  private static boolean hasAnyForegroundServiceType(int foregroundServiceTypes) {
+    return foregroundServiceTypes != ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE
+        && foregroundServiceTypes != ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST;
+  }
+
   /**
    * Ensures Android's 5-second {@code startForeground()} contract is satisfied before an early
    * return from {@link #onStartCommand(Intent, int, int)}.
@@ -448,9 +475,9 @@ public class ForegroundService extends Service {
    * required.
    *
    * @throws RuntimeException if the manifest is missing required {@code foregroundServiceType}
-   *     declarations on API 34+, or if the defensive {@code startForeground()} call fails for any
-   *     other reason. In both cases, the exception terminates the process with a crash report that
-   *     is more actionable than the ANR that would otherwise occur.
+   *     declarations on API 34+, or if the defensive {@code startForeground()} call fails for a
+   *     non-platform-permission reason. {@link SecurityException} is handled as a best-effort stop
+   *     because API 34+ can deny while-in-use types when the app is backgrounded.
    */
   @SuppressLint({"ForegroundServiceType", "MissingPermission"})
   private void ensureStartForegroundContractSatisfied() {
@@ -463,7 +490,7 @@ public class ForegroundService extends Service {
     int declaredTypes = 0;
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
       declaredTypes = getDeclaredForegroundServiceType();
-      if (declaredTypes == 0) {
+      if (!hasAnyForegroundServiceType(declaredTypes)) {
         String msg =
             "react-native-notify-kit: ForegroundService cannot start — "
                 + "no foregroundServiceType declared in AndroidManifest.xml on API 34+. "
@@ -488,15 +515,22 @@ public class ForegroundService extends Service {
               .setSmallIcon(android.R.drawable.ic_dialog_info)
               .build();
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-        // On API 34+, pass the manifest-declared type explicitly rather than relying on
-        // the 2-param startForeground() to resolve type 0 → manifest type. This avoids
-        // ambiguity about implicit type resolution behavior across OEM variants.
-        startForeground(DEFENSIVE_NOTIFICATION_ID, placeholder, declaredTypes);
+        // The STOP/null defensive placeholder does not represent the real workload. Prefer a
+        // declared type without while-in-use runtime restrictions before falling back to the
+        // manifest-declared mask.
+        int defensiveTypes = selectDefensiveForegroundServiceType(declaredTypes);
+        startForeground(DEFENSIVE_NOTIFICATION_ID, placeholder, defensiveTypes);
       } else {
         startForeground(DEFENSIVE_NOTIFICATION_ID, placeholder);
       }
       mStartForegroundCalled = true;
       stopForegroundCompat();
+    } catch (SecurityException e) {
+      Logger.w(
+          TAG,
+          "Defensive startForeground() was denied by Android while stopping the service; "
+              + "continuing with stopSelf() to avoid a fatal app crash.",
+          e);
     } catch (Exception e) {
       String msg =
           "react-native-notify-kit: defensive startForeground() failed. "

package/android/src/test/java/app/notifee/core/ForegroundServiceTest.java

@@ -10,13 +10,16 @@ import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.Service;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.os.Bundle;
 import androidx.core.app.NotificationCompat;
 import app.notifee.core.event.NotificationEvent;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import org.greenrobot.eventbus.Subscribe;
@@ -30,6 +33,9 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.android.controller.ServiceController;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowService;
 
 @RunWith(RobolectricTestRunner.class)
 public class ForegroundServiceTest {
@@ -198,6 +204,90 @@ public class ForegroundServiceTest {
     assertEquals(Service.START_STICKY_COMPATIBILITY, result);
   }
 
+  @Test
+  @Config(sdk = 34)
+  public void onStartCommand_stopIntentApi34MicrophoneAndDataSync_usesDataSyncDefensiveType()
+      throws Exception {
+    declareForegroundServiceTypes(
+        ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
+            | ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
+    ServiceController<ForegroundService> controller =
+        Robolectric.buildService(ForegroundService.class);
+    ForegroundService service = controller.create().get();
+
+    int result = service.onStartCommand(buildStopIntent(), 0, 1);
+
+    assertEquals(Service.START_STICKY_COMPATIBILITY, result);
+    assertEquals(
+        ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC, getLastForegroundServiceType(service));
+  }
+
+  @Test
+  @Config(sdk = 34)
+  public void onStartCommand_stopIntentApi34CameraAndDataSync_usesDataSyncDefensiveType()
+      throws Exception {
+    declareForegroundServiceTypes(
+        ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA | ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
+    ServiceController<ForegroundService> controller =
+        Robolectric.buildService(ForegroundService.class);
+    ForegroundService service = controller.create().get();
+
+    int result = service.onStartCommand(buildStopIntent(), 0, 1);
+
+    assertEquals(Service.START_STICKY_COMPATIBILITY, result);
+    assertEquals(
+        ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC, getLastForegroundServiceType(service));
+  }
+
+  @Test
+  @Config(sdk = 34)
+  public void
+      onStartCommand_stopIntentApi34ShortServiceAndMicrophone_usesShortServiceDefensiveType()
+          throws Exception {
+    declareForegroundServiceTypes(
+        ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
+            | ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
+    ServiceController<ForegroundService> controller =
+        Robolectric.buildService(ForegroundService.class);
+    ForegroundService service = controller.create().get();
+
+    int result = service.onStartCommand(buildStopIntent(), 0, 1);
+
+    assertEquals(Service.START_STICKY_COMPATIBILITY, result);
+    assertEquals(
+        ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE, getLastForegroundServiceType(service));
+  }
+
+  @Test
+  @Config(sdk = 34)
+  public void onStartCommand_stopIntentApi34MicrophoneOnly_doesNotUseUndeclaredShortService()
+      throws Exception {
+    declareForegroundServiceTypes(ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
+    ServiceController<ForegroundService> controller =
+        Robolectric.buildService(ForegroundService.class);
+    ForegroundService service = controller.create().get();
+
+    int result = service.onStartCommand(buildStopIntent(), 0, 1);
+
+    assertEquals(Service.START_STICKY_COMPATIBILITY, result);
+    assertEquals(
+        ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE, getLastForegroundServiceType(service));
+  }
+
+  @Test
+  @Config(sdk = 34, shadows = ThrowingStartForegroundShadowService.class)
+  public void onStartCommand_stopIntentApi34SecurityException_doesNotCrash() throws Exception {
+    declareForegroundServiceTypes(ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
+    ServiceController<ForegroundService> controller =
+        Robolectric.buildService(ForegroundService.class);
+    ForegroundService service = controller.create().get();
+
+    int result = service.onStartCommand(buildStopIntent(), 0, 1);
+
+    assertEquals(Service.START_STICKY_COMPATIBILITY, result);
+    assertTrue(org.robolectric.Shadows.shadowOf(service).isStoppedBySelf());
+  }
+
   // ──────────────────────────────────────────────────────────────────────────
   // START path and onTimeout event emission (regression guards for 9.1.13)
   // ──────────────────────────────────────────────────────────────────────────
@@ -391,6 +481,42 @@ public class ForegroundServiceTest {
     return intent;
   }
 
+  private static Intent buildStopIntent() {
+    Intent intent = new Intent();
+    intent.setAction(ForegroundService.STOP_FOREGROUND_SERVICE_ACTION);
+    return intent;
+  }
+
+  private static void declareForegroundServiceTypes(int foregroundServiceTypes) throws Exception {
+    Context context = RuntimeEnvironment.getApplication();
+    ComponentName component = new ComponentName(context, ForegroundService.class);
+    ServiceInfo serviceInfo;
+    try {
+      serviceInfo =
+          context.getPackageManager().getServiceInfo(component, PackageManager.GET_META_DATA);
+    } catch (PackageManager.NameNotFoundException e) {
+      serviceInfo = new ServiceInfo();
+    }
+    serviceInfo.packageName = component.getPackageName();
+    serviceInfo.name = component.getClassName();
+    setForegroundServiceType(serviceInfo, foregroundServiceTypes);
+    org.robolectric.Shadows.shadowOf(context.getPackageManager()).addOrUpdateService(serviceInfo);
+  }
+
+  private static void setForegroundServiceType(ServiceInfo serviceInfo, int foregroundServiceTypes)
+      throws Exception {
+    Field field = ServiceInfo.class.getDeclaredField("mForegroundServiceType");
+    field.setAccessible(true);
+    field.setInt(serviceInfo, foregroundServiceTypes);
+  }
+
+  private static int getLastForegroundServiceType(Service service) throws Exception {
+    Object shadowService = org.robolectric.Shadows.shadowOf(service);
+    Method method = ShadowService.class.getDeclaredMethod("getForegroundServiceType");
+    method.setAccessible(true);
+    return (int) method.invoke(shadowService);
+  }
+
   /**
    * Populates the service's private static tracking fields directly, simulating the post-START
    * state that onTimeout expects to observe. Using reflection here (rather than running a full
@@ -426,4 +552,12 @@ public class ForegroundServiceTest {
       events.add(event);
     }
   }
+
+  @Implements(Service.class)
+  public static class ThrowingStartForegroundShadowService extends ShadowService {
+    @Implementation
+    protected void startForeground(int id, Notification notification, int foregroundServiceType) {
+      throw new SecurityException("while-in-use foreground service type denied");
+    }
+  }
 }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "10.4.6";
+export declare const version = "10.4.7";

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '10.4.6';
+export const version = '10.4.7';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-notify-kit",
-  "version": "10.4.6",
+  "version": "10.4.7",
   "author": "Marco Crupi",
   "description": "Maintained Notifee-compatible React Native notifications library for Android, iOS, FCM Mode, rich notifications, foreground services, and Expo CNG development builds.",
   "main": "dist/index.js",

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '10.4.6';
+export const version = '10.4.7';