react-native-notify-kit 10.1.0 → 10.2.1

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

@@ -21,6 +21,7 @@ import static app.notifee.core.event.NotificationEvent.TYPE_ACTION_PRESS;
 import static app.notifee.core.event.NotificationEvent.TYPE_DISMISSED;
 import static app.notifee.core.event.NotificationEvent.TYPE_PRESS;
 
+import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
@@ -171,10 +172,6 @@ public class ReceiverService extends Service {
     }
   }
 
-  // ACTION_CLOSE_SYSTEM_DIALOGS is deprecated since API 31, but is still needed on API < 31
-  // to close the notification drawer after an action press. Already guarded with Build.VERSION
-  // check.
-  @SuppressWarnings("deprecation")
   private void onActionPressIntent(Intent intent) {
     Bundle notification = intent.getBundleExtra("notification");
     Bundle pressAction = intent.getBundleExtra("pressAction");
@@ -221,16 +218,24 @@ public class ReceiverService extends Service {
           mainComponent,
           pressActionBundle.getLaunchActivityFlags());
 
-      int targetSdkVersion =
-          ContextHolder.getApplicationContext().getApplicationInfo().targetSdkVersion;
+      closeSystemDialogsBestEffort();
+    }
+  }
 
-      // Close notification drawer if application SDK is Android 11 and lower
-      // See
-      // https://developer.android.com/about/versions/12/behavior-changes-all#close-system-dialogs
-      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-        ContextHolder.getApplicationContext()
-            .sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
-      }
+  @SuppressWarnings("deprecation")
+  @SuppressLint("MissingPermission")
+  private void closeSystemDialogsBestEffort() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      return;
+    }
+
+    // BROADCAST_CLOSE_SYSTEM_DIALOGS is protected/system-only, so the library intentionally does
+    // not declare it. Keep this pre-Android 12 legacy broadcast best-effort; Android 12+ skips it.
+    try {
+      ContextHolder.getApplicationContext()
+          .sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
+    } catch (SecurityException e) {
+      Logger.w(TAG, "Unable to close system dialogs with legacy broadcast", e);
     }
   }
 

package/android/src/main/java/app/notifee/core/model/NotificationAndroidActionModel.java

@@ -77,8 +77,7 @@ public class NotificationAndroidActionModel {
    * @return RemoteInput
    */
   public @Nullable RemoteInput getRemoteInput(NotificationCompat.Action.Builder actionBuilder) {
-    if (mNotificationAndroidActionBundle.containsKey("input")
-        && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT_WATCH) {
+    if (mNotificationAndroidActionBundle.containsKey("input")) {
       Bundle inputBundle =
           Objects.requireNonNull(mNotificationAndroidActionBundle.getBundle("input"));
 

package/android/src/main/java/app/notifee/core/model/NotificationAndroidPressActionModel.java

@@ -105,9 +105,7 @@ public class NotificationAndroidPressActionModel {
           baseFlags |= Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET;
           break;
         case 12:
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            baseFlags |= Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
-          }
+          baseFlags |= Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
           break;
         case 13:
           baseFlags |= Intent.FLAG_ACTIVITY_NO_USER_ACTION;
@@ -125,14 +123,10 @@ public class NotificationAndroidPressActionModel {
           baseFlags |= Intent.FLAG_ACTIVITY_TASK_ON_HOME;
           break;
         case 18:
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            baseFlags |= Intent.FLAG_ACTIVITY_RETAIN_IN_RECENTS;
-          }
+          baseFlags |= Intent.FLAG_ACTIVITY_RETAIN_IN_RECENTS;
           break;
         case 19:
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            baseFlags |= Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT;
-          }
+          baseFlags |= Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT;
           break;
         case 20:
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {

package/android/src/main/java/app/notifee/core/model/TimestampTriggerModel.java

@@ -30,13 +30,13 @@ public class TimestampTriggerModel {
   private Boolean mWithAlarmManager = false;
   private AlarmType mAlarmType = AlarmType.SET_EXACT;
   private String mRepeatFrequency = null;
+  private int mRepeatInterval = 1;
   private Long mTimestamp = null;
 
   public static final String HOURLY = "HOURLY";
   public static final String DAILY = "DAILY";
   public static final String WEEKLY = "WEEKLY";
-
-  private static final long HOUR_IN_MS = 60L * 60 * 1000;
+  public static final String MONTHLY = "MONTHLY";
 
   private static final String TAG = "TimeTriggerModel";
 
@@ -47,6 +47,7 @@ public class TimestampTriggerModel {
     TimeUnit timeUnit = null;
     if (mTimeTriggerBundle.containsKey("repeatFrequency")) {
       int repeatFrequency = ObjectUtils.getInt(mTimeTriggerBundle.get("repeatFrequency"));
+      mRepeatInterval = getRepeatInterval(mTimeTriggerBundle.get("repeatInterval"));
       mTimestamp = ObjectUtils.getLong(mTimeTriggerBundle.get("timestamp"));
 
       switch (repeatFrequency) {
@@ -54,21 +55,24 @@ public class TimestampTriggerModel {
           // default value for one-time trigger
           break;
         case 0:
-          mInterval = 1;
+          mInterval = mRepeatInterval;
           mTimeUnit = TimeUnit.HOURS;
           mRepeatFrequency = HOURLY;
           break;
         case 1:
-          mInterval = 1;
+          mInterval = mRepeatInterval;
           mTimeUnit = TimeUnit.DAYS;
           mRepeatFrequency = DAILY;
           break;
         case 2:
           // weekly, 7 days
-          mInterval = 7;
+          mInterval = 7 * mRepeatInterval;
           mTimeUnit = TimeUnit.DAYS;
           mRepeatFrequency = WEEKLY;
           break;
+        case 3:
+          mRepeatFrequency = MONTHLY;
+          break;
       }
     }
 
@@ -139,33 +143,27 @@ public class TimestampTriggerModel {
       return;
     }
 
-    long timestamp = getTimestamp();
+    Calendar cal = Calendar.getInstance();
+    cal.setTimeInMillis(getTimestamp());
 
+    int field;
     if (HOURLY.equals(mRepeatFrequency)) {
-      // Hourly: fixed ms is correct — no wall-clock preservation needed
-      while (timestamp < System.currentTimeMillis()) {
-        timestamp += HOUR_IN_MS;
-      }
-      this.mTimestamp = timestamp;
+      field = Calendar.HOUR_OF_DAY;
+    } else if (DAILY.equals(mRepeatFrequency)) {
+      field = Calendar.DAY_OF_MONTH;
+    } else if (WEEKLY.equals(mRepeatFrequency)) {
+      field = Calendar.WEEK_OF_YEAR;
+    } else if (MONTHLY.equals(mRepeatFrequency)) {
+      field = Calendar.MONTH;
     } else {
-      // Daily/Weekly: use Calendar.add() to preserve local wall-clock time across DST boundaries.
-      // Adding fixed ms (86,400,000) breaks when a calendar day is 23 or 25 hours during DST.
-      Calendar cal = Calendar.getInstance();
-      cal.setTimeInMillis(timestamp);
-
-      int field;
-      if (WEEKLY.equals(mRepeatFrequency)) {
-        field = Calendar.WEEK_OF_YEAR;
-      } else {
-        field = Calendar.DAY_OF_MONTH;
-      }
-
-      while (cal.getTimeInMillis() < System.currentTimeMillis()) {
-        cal.add(field, 1);
-      }
+      return;
+    }
 
-      this.mTimestamp = cal.getTimeInMillis();
+    while (cal.getTimeInMillis() < System.currentTimeMillis()) {
+      cal.add(field, mRepeatInterval);
     }
+
+    this.mTimestamp = cal.getTimeInMillis();
   }
 
   public enum AlarmType {
@@ -196,6 +194,23 @@ public class TimestampTriggerModel {
     return mRepeatFrequency;
   }
 
+  private int getRepeatInterval(Object repeatInterval) {
+    if (!(repeatInterval instanceof Number)) {
+      return 1;
+    }
+
+    double interval = ((Number) repeatInterval).doubleValue();
+    if (Double.isNaN(interval)
+        || Double.isInfinite(interval)
+        || interval <= 0
+        || interval % 1 != 0
+        || interval > Integer.MAX_VALUE) {
+      return 1;
+    }
+
+    return (int) interval;
+  }
+
   public Bundle toBundle() {
     Bundle bundle = (Bundle) mTimeTriggerBundle.clone();
     if (mTimestamp != null) {

package/android/src/main/java/app/notifee/core/utility/IntentUtils.java

@@ -22,40 +22,12 @@ import static app.notifee.core.ContextHolder.getApplicationContext;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.Build;
 import androidx.annotation.Nullable;
 import app.notifee.core.Logger;
-import java.util.List;
 
 public class IntentUtils {
   private static final String TAG = "IntentUtils";
 
-  @SuppressWarnings("deprecation")
-  public static boolean isAvailableOnDevice(Context ctx, Intent intent) {
-    try {
-      if (ctx == null || intent == null) {
-        return false;
-      }
-
-      final PackageManager mgr = ctx.getPackageManager();
-      List<ResolveInfo> list;
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        list =
-            mgr.queryIntentActivities(
-                intent, PackageManager.ResolveInfoFlags.of(PackageManager.MATCH_DEFAULT_ONLY));
-      } else {
-        list = mgr.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-      }
-      return !list.isEmpty();
-    } catch (Exception e) {
-      Logger.e(TAG, "An error occurred whilst trying to check if intent is available on device", e);
-
-      return false;
-    }
-  }
-
   public static String getActivityName(Intent intent) {
     if (intent == null) {
       return null;

package/android/src/main/java/app/notifee/core/utility/PowerManagerUtils.java

@@ -18,6 +18,7 @@ package app.notifee.core.utility;
  */
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -55,24 +56,12 @@ public class PowerManagerUtils {
    * @param activity
    */
   public static void openBatteryOptimizationSettings(Activity activity) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-      return;
-    }
-
     try {
       Intent intent = new Intent();
       intent.setAction(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS);
       intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
       if (activity != null) {
-        Boolean isAvailableOnDevice =
-            IntentUtils.isAvailableOnDevice(ContextHolder.getApplicationContext(), intent);
-
-        if (!isAvailableOnDevice) {
-          Logger.d(TAG, "battery optimization settings is not available on device");
-          return;
-        }
-
         IntentUtils.startActivityOnUiThread(activity, intent);
       }
     } catch (Exception e) {
@@ -86,9 +75,6 @@ public class PowerManagerUtils {
    * @param context
    */
   public static Boolean isBatteryOptimizationEnabled(Context context) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-      return false;
-    }
     PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
     return !pm.isIgnoringBatteryOptimizations(context.getPackageName());
   }
@@ -129,7 +115,7 @@ public class PowerManagerUtils {
   public static PowerManagerInfo getPowerManagerInfo() {
     String activityName;
 
-    Intent intent = findPowerManagerIntent(ContextHolder.getApplicationContext());
+    Intent intent = getFirstPowerManagerIntent();
     activityName = IntentUtils.getActivityName(intent);
 
     PowerManagerInfo result =
@@ -143,37 +129,90 @@ public class PowerManagerUtils {
    * @param activity
    */
   public static void openPowerManagerSettings(Activity activity) {
-    Intent intent = getPowerManagerIntent();
-    if (intent == null) {
-      intent = findPowerManagerIntent(ContextHolder.getApplicationContext());
+    if (activity == null) {
+      Logger.w(TAG, "Activity is null when trying to open the device's power manager");
+      return;
     }
 
-    if (intent != null) {
-      try {
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        IntentUtils.startActivityOnUiThread(activity, intent);
-      } catch (Exception exception) {
-        Logger.e(
-            TAG, "Unable to start activity: " + IntentUtils.getActivityName(intent), exception);
-      }
-    } else {
+    Context context = ContextHolder.getApplicationContext();
+    if (context == null) {
+      Logger.w(TAG, "Unable to get application context when opening the device's power manager");
+      return;
+    }
+
+    List<Intent> possibleIntents = getPowerManagerIntentCandidates();
+    if (possibleIntents.isEmpty()) {
       Logger.w(TAG, "Unable to find an activity to open the device's power manager");
+      return;
+    }
+
+    activity.runOnUiThread(
+        () -> {
+          for (Intent possibleIntent : possibleIntents) {
+            if (startPowerManagerIntent(context, possibleIntent)) {
+              return;
+            }
+          }
+
+          Logger.w(TAG, "Unable to open the device's power manager");
+        });
+  }
+
+  private static Intent getFirstPowerManagerIntent() {
+    List<Intent> possibleIntents = getManufacturerPowerManagerIntents(getManufacturerName());
+    if (possibleIntents.isEmpty()) {
+      return null;
+    }
+
+    return possibleIntents.get(0);
+  }
+
+  private static List<Intent> getPowerManagerIntentCandidates() {
+    List<Intent> possibleIntents = new ArrayList<>();
+    Intent cachedIntent = getPowerManagerIntent();
+
+    if (cachedIntent != null) {
+      possibleIntents.add(cachedIntent);
     }
+
+    for (Intent manufacturerIntent : getManufacturerPowerManagerIntents(getManufacturerName())) {
+      if (!containsEquivalentIntent(possibleIntents, manufacturerIntent)) {
+        possibleIntents.add(manufacturerIntent);
+      }
+    }
+
+    return possibleIntents;
   }
 
-  private static Intent findPowerManagerIntent(Context context) {
-    String manufacturerName = Build.BRAND.toLowerCase(Locale.US);
-    List<Intent> possibleIntents = getManufacturerPowerManagerIntents(manufacturerName);
+  private static String getManufacturerName() {
+    return Build.BRAND.toLowerCase(Locale.US);
+  }
 
-    for (int i = 0; i < possibleIntents.size(); i++) {
-      Intent possibleIntent = possibleIntents.get(i);
-      Boolean isAvailableOnDevice = IntentUtils.isAvailableOnDevice(context, possibleIntent);
-      if (isAvailableOnDevice) {
-        setPowerManagerIntentCache(possibleIntent);
-        return possibleIntent;
+  private static boolean containsEquivalentIntent(List<Intent> possibleIntents, Intent candidate) {
+    for (Intent possibleIntent : possibleIntents) {
+      if (possibleIntent.filterEquals(candidate)) {
+        return true;
       }
     }
-    return null;
+
+    return false;
+  }
+
+  private static boolean startPowerManagerIntent(Context context, Intent possibleIntent) {
+    Intent intent = new Intent(possibleIntent);
+    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+    try {
+      context.startActivity(intent);
+      setPowerManagerIntentCache(intent);
+      return true;
+    } catch (ActivityNotFoundException | SecurityException e) {
+      Logger.w(TAG, "Unable to start activity: " + IntentUtils.getActivityName(intent), e);
+    } catch (RuntimeException e) {
+      Logger.w(TAG, "Unable to start activity: " + IntentUtils.getActivityName(intent), e);
+    }
+
+    return false;
   }
 
   private static List<Intent> getManufacturerPowerManagerIntents(String manufacturerName) {
@@ -249,9 +288,8 @@ public class PowerManagerUtils {
                 createIntent(
                     "com.oppo.safe", "com.oppo.safe.permission.startup.StartupAppListActivity"),
                 createIntent(
-                        "com.coloros.safecenter",
-                        "com.coloros.safecenter.startupapp.StartupAppListActivity")
-                    .setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS),
+                    "com.coloros.safecenter",
+                    "com.coloros.safecenter.startupapp.StartupAppListActivity"),
                 createIntent(
                     "com.coloros.oppoguardelf",
                     "com.coloros.powermanager.fuelgaue.PowerUsageModelActivity"),

package/android/src/main/java/app/notifee/core/utility/ResourceUtils.java

@@ -17,6 +17,7 @@ package app.notifee.core.utility;
  *
  */
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.graphics.Bitmap;
@@ -44,6 +45,7 @@ import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 public class ResourceUtils {
@@ -252,12 +254,13 @@ public class ResourceUtils {
   }
 
   /** Attempts to find a resource id by name and type */
+  @SuppressLint("DiscouragedApi")
   private static int getResourceIdByName(String name, String type) {
     if (name == null || name.isEmpty()) {
       return 0;
     }
 
-    name = name.toLowerCase().replace("-", "_");
+    name = name.toLowerCase(Locale.ROOT).replace("-", "_");
 
     String key = name + "_" + type;
 
@@ -270,6 +273,7 @@ public class ResourceUtils {
       Context context = ContextHolder.getApplicationContext();
       String packageName = context.getPackageName();
 
+      // Consumer resource names are provided dynamically from JS, so runtime lookup is intentional.
       int id = context.getResources().getIdentifier(name, type, packageName);
       getResourceIdCache().put(key, id);
       return id;

package/android/src/main/kotlin/io/invertase/notifee/NotifeeApiModule.kt

@@ -157,7 +157,7 @@ class NotifeeApiModule(reactContext: ReactApplicationContext) :
 
     override fun openAlarmPermissionSettings(promise: Promise) {
         Notifee.getInstance()
-            .openAlarmPermissionSettings(getCurrentActivity()) { e, _ ->
+            .openAlarmPermissionSettings(getReactApplicationContext().getCurrentActivity()) { e, _ ->
                 NotifeeReactUtils.promiseResolver(promise, e)
             }
     }
@@ -220,7 +220,7 @@ class NotifeeApiModule(reactContext: ReactApplicationContext) :
 
     override fun getInitialNotification(promise: Promise) {
         Notifee.getInstance()
-            .getInitialNotification(getCurrentActivity()) { e, bundle ->
+            .getInitialNotification(getReactApplicationContext().getCurrentActivity()) { e, bundle ->
                 NotifeeReactUtils.promiseResolver(promise, e, bundle)
             }
     }
@@ -242,7 +242,7 @@ class NotifeeApiModule(reactContext: ReactApplicationContext) :
             return
         }
 
-        val activity = getCurrentActivity() as? PermissionAwareActivity
+        val activity = getReactApplicationContext().getCurrentActivity() as? PermissionAwareActivity
         if (activity == null) {
             Logger.d(
                 "requestPermission",
@@ -277,14 +277,14 @@ class NotifeeApiModule(reactContext: ReactApplicationContext) :
 
     override fun openNotificationSettings(channelId: String?, promise: Promise) {
         Notifee.getInstance()
-            .openNotificationSettings(channelId, getCurrentActivity()) { e, _ ->
+            .openNotificationSettings(channelId, getReactApplicationContext().getCurrentActivity()) { e, _ ->
                 NotifeeReactUtils.promiseResolver(promise, e)
             }
     }
 
     override fun openBatteryOptimizationSettings(promise: Promise) {
         Notifee.getInstance()
-            .openBatteryOptimizationSettings(getCurrentActivity()) { e, _ ->
+            .openBatteryOptimizationSettings(getReactApplicationContext().getCurrentActivity()) { e, _ ->
                 NotifeeReactUtils.promiseResolver(promise, e)
             }
     }
@@ -305,7 +305,7 @@ class NotifeeApiModule(reactContext: ReactApplicationContext) :
 
     override fun openPowerManagerSettings(promise: Promise) {
         Notifee.getInstance()
-            .openPowerManagerSettings(getCurrentActivity()) { e, _ ->
+            .openPowerManagerSettings(getReactApplicationContext().getCurrentActivity()) { e, _ ->
                 NotifeeReactUtils.promiseResolver(promise, e)
             }
     }

package/android/src/main/kotlin/io/invertase/notifee/NotifeeReactUtils.kt

@@ -5,7 +5,6 @@
 package io.invertase.notifee
 
 import android.annotation.SuppressLint
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.lifecycle.Lifecycle
@@ -138,7 +137,7 @@ object NotifeeReactUtils {
         try {
             val service = context.getSystemService("statusbar")
             val statusbarManager = Class.forName("android.app.StatusBarManager")
-            val methodName = if (Build.VERSION.SDK_INT >= 17) "collapsePanels" else "collapse"
+            val methodName = "collapsePanels"
             val collapse: Method = statusbarManager.getMethod(methodName)
             collapse.isAccessible = true
             collapse.invoke(service)