react-native-notify-kit 10.2.0 → 10.3.0

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/NotificationAndroidStyleModel.java

@@ -25,7 +25,8 @@ import androidx.core.app.NotificationCompat;
 import androidx.core.app.Person;
 import androidx.core.graphics.drawable.IconCompat;
 import app.notifee.core.Logger;
-import app.notifee.core.utility.ObjectUtils;
+import app.notifee.core.utility.BundleValueReader;
+import app.notifee.core.utility.ParcelableCompatReader;
 import app.notifee.core.utility.ResourceUtils;
 import app.notifee.core.utility.TextUtils;
 import com.google.common.util.concurrent.Futures;
@@ -114,7 +115,7 @@ public class NotificationAndroidStyleModel {
   @Nullable
   public ListenableFuture<NotificationCompat.Style> getStyleTask(
       ListeningExecutorService lExecutor) {
-    int type = ObjectUtils.getInt(mNotificationAndroidStyleBundle.get("type"));
+    int type = BundleValueReader.getIntPreserving(mNotificationAndroidStyleBundle, "type");
     ListenableFuture<NotificationCompat.Style> styleTask = null;
 
     switch (type) {
@@ -312,12 +313,13 @@ public class NotificationAndroidStyleModel {
           }
 
           ArrayList<Bundle> messages =
-              mNotificationAndroidStyleBundle.getParcelableArrayList("messages");
+              ParcelableCompatReader.getParcelableArrayList(
+                  mNotificationAndroidStyleBundle, "messages", Bundle.class);
 
           for (int i = 0; i < Objects.requireNonNull(messages).size(); i++) {
             Bundle message = messages.get(i);
             Person messagePerson = null;
-            long timestamp = ObjectUtils.getLong(message.get("timestamp"));
+            long timestamp = BundleValueReader.getLongPreserving(message, "timestamp");
 
             if (message.containsKey("person")) {
               messagePerson =

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

@@ -19,6 +19,7 @@ package app.notifee.core.model;
 
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import app.notifee.core.utility.BundleValueReader;
 import app.notifee.core.utility.ObjectUtils;
 import java.util.Calendar;
 import java.util.concurrent.TimeUnit;
@@ -46,9 +47,11 @@ public class TimestampTriggerModel {
     // set initial values
     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"));
+      int repeatFrequency =
+          BundleValueReader.getIntPreserving(mTimeTriggerBundle, "repeatFrequency");
+      mRepeatInterval =
+          getRepeatInterval(BundleValueReader.getValue(mTimeTriggerBundle, "repeatInterval"));
+      mTimestamp = BundleValueReader.getLongPreserving(mTimeTriggerBundle, "timestamp");
 
       switch (repeatFrequency) {
         case -1:
@@ -81,7 +84,7 @@ public class TimestampTriggerModel {
 
       Bundle alarmManagerBundle = mTimeTriggerBundle.getBundle("alarmManager");
 
-      Object typeObj = alarmManagerBundle.get("type");
+      Object typeObj = BundleValueReader.getValue(alarmManagerBundle, "type");
 
       int type;
       if (typeObj != null) {

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

@@ -0,0 +1,65 @@
+package app.notifee.core.utility;
+
+/*
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import java.util.ArrayList;
+
+public final class BundleValueReader {
+
+  private BundleValueReader() {}
+
+  @SuppressWarnings("deprecation")
+  @Nullable
+  public static Object getValue(@NonNull Bundle bundle, @Nullable String key) {
+    return bundle.get(key);
+  }
+
+  @Nullable
+  public static ArrayList<?> getArrayListValue(@NonNull Bundle bundle, @Nullable String key) {
+    return (ArrayList<?>) getValue(bundle, key);
+  }
+
+  public static int getIntPreserving(@NonNull Bundle bundle, @Nullable String key) {
+    return ObjectUtils.getInt(getValue(bundle, key));
+  }
+
+  public static int getIntPreserving(
+      @NonNull Bundle bundle, @Nullable String key, int defaultValue) {
+    if (!bundle.containsKey(key)) {
+      return defaultValue;
+    }
+
+    return getIntPreserving(bundle, key);
+  }
+
+  public static long getLongPreserving(@NonNull Bundle bundle, @Nullable String key) {
+    return ObjectUtils.getLong(getValue(bundle, key));
+  }
+
+  public static long getLongPreserving(
+      @NonNull Bundle bundle, @Nullable String key, long defaultValue) {
+    if (!bundle.containsKey(key)) {
+      return defaultValue;
+    }
+
+    return getLongPreserving(bundle, key);
+  }
+}

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/ObjectUtils.java

@@ -111,7 +111,7 @@ public class ObjectUtils {
   public static Map<String, Object> bundleToMap(Bundle bundle) throws IllegalArgumentException {
     Map<String, Object> map = new HashMap<>();
     for (String key : bundle.keySet()) {
-      Object value = bundle.get(key);
+      Object value = BundleValueReader.getValue(bundle, key);
       if (value == null) {
         map.put(key, null);
       } else if (value.getClass().isArray()) {

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

@@ -0,0 +1,64 @@
+package app.notifee.core.utility;
+
+/*
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Parcelable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import java.util.ArrayList;
+
+public final class ParcelableCompatReader {
+
+  private ParcelableCompatReader() {}
+
+  @Nullable
+  public static <T extends Parcelable> T getParcelable(
+      @NonNull Bundle bundle, @Nullable String key, @NonNull Class<T> clazz) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      return bundle.getParcelable(key, clazz);
+    }
+
+    return getParcelableLegacy(bundle, key);
+  }
+
+  @Nullable
+  public static <T extends Parcelable> ArrayList<T> getParcelableArrayList(
+      @NonNull Bundle bundle, @Nullable String key, @NonNull Class<T> clazz) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      return bundle.getParcelableArrayList(key, clazz);
+    }
+
+    return getParcelableArrayListLegacy(bundle, key);
+  }
+
+  @SuppressWarnings({"deprecation", "unchecked"})
+  @Nullable
+  private static <T extends Parcelable> T getParcelableLegacy(
+      @NonNull Bundle bundle, @Nullable String key) {
+    return bundle.getParcelable(key);
+  }
+
+  @SuppressWarnings({"deprecation", "unchecked"})
+  @Nullable
+  private static <T extends Parcelable> ArrayList<T> getParcelableArrayListLegacy(
+      @NonNull Bundle bundle, @Nullable String key) {
+    return bundle.getParcelableArrayList(key);
+  }
+}

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;
@@ -253,6 +254,7 @@ 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;
@@ -271,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

@@ -199,7 +199,7 @@ class NotifeeApiModule(reactContext: ReactApplicationContext) :
 
     override fun getChannelGroup(channelGroupId: String, promise: Promise) {
         Notifee.getInstance()
-            .getChannel(channelGroupId) { e, bundle ->
+            .getChannelGroup(channelGroupId) { e, bundle ->
                 NotifeeReactUtils.promiseResolver(promise, e, bundle)
             }
     }

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

@@ -6,7 +6,6 @@ package io.invertase.notifee
 
 import app.notifee.core.InitProvider
 import app.notifee.core.Notifee
-import com.facebook.react.modules.systeminfo.ReactNativeVersion
 
 class NotifeeInitProvider : InitProvider() {
 
@@ -15,29 +14,4 @@ class NotifeeInitProvider : InitProvider() {
         Notifee.initialize(NotifeeEventSubscriber())
         return result
     }
-
-    private fun getApplicationVersionString(): String {
-        val context = this.context ?: return "unknown"
-        return try {
-            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-            pInfo.versionName ?: "unknown"
-        } catch (e: Exception) {
-            "unknown"
-        }
-    }
-
-    private fun getReactNativeVersionString(): String {
-        val versionMap = ReactNativeVersion.VERSION
-        val major = versionMap["major"] as Int
-        val minor = versionMap["minor"] as Int
-        val patch = versionMap["patch"] as Int
-        val prerelease = versionMap["prerelease"] as? String
-
-        return buildString {
-            append("$major.$minor.$patch")
-            if (prerelease != null) {
-                append(".$prerelease")
-            }
-        }
-    }
 }

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)