react-native-notify-kit 10.2.1 → 10.3.0

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

@@ -39,6 +39,7 @@ import app.notifee.core.event.ForegroundServiceEvent;
 import app.notifee.core.event.NotificationEvent;
 import app.notifee.core.interfaces.MethodCallResult;
 import app.notifee.core.model.NotificationModel;
+import app.notifee.core.utility.ParcelableCompatReader;
 
 public class ForegroundService extends Service {
   private static final String TAG = "ForegroundService";
@@ -186,7 +187,8 @@ public class ForegroundService extends Service {
       if (extras != null) {
         // Hash code is sent to service to ensure it is kept the same
         int hashCode = extras.getInt("hashCode");
-        Notification notification = extras.getParcelable("notification");
+        Notification notification =
+            ParcelableCompatReader.getParcelable(extras, "notification", Notification.class);
         Bundle bundle = extras.getBundle("notificationBundle");
 
         if (notification != null && bundle != null) {

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

@@ -37,6 +37,7 @@ import app.notifee.core.model.NotificationAndroidModel;
 import app.notifee.core.model.NotificationModel;
 import app.notifee.core.model.TimestampTriggerModel;
 import app.notifee.core.utility.AlarmUtils;
+import app.notifee.core.utility.BundleValueReader;
 import app.notifee.core.utility.ExtendedListenableFuture;
 import app.notifee.core.utility.ObjectUtils;
 import com.google.common.util.concurrent.FutureCallback;
@@ -195,7 +196,8 @@ class NotifeeAlarmManager {
                   NotificationManager.displayNotification(notificationModel, triggerBundle),
                   voidDisplayedNotification -> {
                     if (triggerBundle.containsKey("repeatFrequency")
-                        && ObjectUtils.getInt(triggerBundle.get("repeatFrequency")) != -1) {
+                        && BundleValueReader.getIntPreserving(triggerBundle, "repeatFrequency")
+                            != -1) {
                       TimestampTriggerModel trigger =
                           TimestampTriggerModel.fromBundle(triggerBundle);
                       // scheduleTimestampTriggerNotification() calls setNextTimestamp()
@@ -424,7 +426,7 @@ class NotifeeAlarmManager {
     NotificationModel notificationModel =
         NotificationModel.fromBundle(ObjectUtils.bytesToBundle(notificationBytes));
 
-    int triggerType = ObjectUtils.getInt(triggerBundle.get("type"));
+    int triggerType = BundleValueReader.getIntPreserving(triggerBundle, "type");
 
     switch (triggerType) {
       case 0:

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

@@ -61,6 +61,7 @@ import app.notifee.core.model.NotificationAndroidPressActionModel;
 import app.notifee.core.model.NotificationAndroidStyleModel;
 import app.notifee.core.model.NotificationModel;
 import app.notifee.core.model.TimestampTriggerModel;
+import app.notifee.core.utility.BundleValueReader;
 import app.notifee.core.utility.ExtendedListenableFuture;
 import app.notifee.core.utility.IntentUtils;
 import app.notifee.core.utility.ObjectUtils;
@@ -168,18 +169,7 @@ class NotificationManager {
             //      so tapping the notification opens the app (defense-in-depth for paths that
             //      bypass the TS validator).
             //   2. pressAction has the opt-out sentinel id: user explicitly passed
-            //      pressAction: null in JS — pass null to createIntent so no launch intent
-            //      is created (non-tappable notification).
-            //   3. pressAction is a normal bundle: pass through unchanged.
-            // Resolve the effective pressAction bundle for the content intent.
-            // Three cases:
-            //   1. pressAction is null (absent from bundle, e.g. trigger rehydrated from Room DB
-            //      after app kill): synthesize default { id:'default', launchActivity:'default' }
-            //      so tapping the notification opens the app (defense-in-depth for paths that
-            //      bypass the TS validator).
-            //   2. pressAction has the opt-out sentinel id: user explicitly passed
-            //      pressAction: null in JS — pass null to createIntent so no launch intent
-            //      is created (non-tappable notification).
+            //      pressAction: null in JS, so no content intent is created.
             //   3. pressAction is a normal bundle: pass through unchanged.
             //
             // pressActionForIntent  → used for creating the launch intent (or null for opt-out)
@@ -205,23 +195,25 @@ class NotificationManager {
 
             int targetSdkVersion =
                 ContextHolder.getApplicationContext().getApplicationInfo().targetSdkVersion;
-            if (targetSdkVersion >= Build.VERSION_CODES.S
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-              builder.setContentIntent(
-                  NotificationPendingIntent.createIntent(
-                      notificationModel.getHashCode(),
-                      pressActionForIntent,
-                      TYPE_PRESS,
-                      new String[] {"notification", "pressAction"},
-                      notificationModel.toBundle(),
-                      pressActionForExtras));
-            } else {
-              builder.setContentIntent(
-                  ReceiverService.createIntent(
-                      ReceiverService.PRESS_INTENT,
-                      new String[] {"notification", "pressAction"},
-                      notificationModel.toBundle(),
-                      pressActionForIntent));
+            if (pressActionForIntent != null) {
+              if (targetSdkVersion >= Build.VERSION_CODES.S
+                  && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                builder.setContentIntent(
+                    NotificationPendingIntent.createIntent(
+                        notificationModel.getHashCode(),
+                        pressActionForIntent,
+                        TYPE_PRESS,
+                        new String[] {"notification", "pressAction"},
+                        notificationModel.toBundle(),
+                        pressActionForExtras));
+              } else {
+                builder.setContentIntent(
+                    ReceiverService.createIntent(
+                        ReceiverService.PRESS_INTENT,
+                        new String[] {"notification", "pressAction"},
+                        notificationModel.toBundle(),
+                        pressActionForIntent));
+              }
             }
 
             if (notificationModel.getTitle() != null) {
@@ -744,7 +736,7 @@ class NotificationManager {
 
   static ListenableFuture<Void> createTriggerNotification(
       NotificationModel notificationModel, Bundle triggerBundle) {
-    int triggerType = ObjectUtils.getInt(triggerBundle.get("type"));
+    int triggerType = BundleValueReader.getIntPreserving(triggerBundle, "type");
     ListenableFuture<Void> scheduleFuture;
     switch (triggerType) {
       case 0:
@@ -903,19 +895,19 @@ class NotificationManager {
               notificationBundle = new Bundle();
               notificationBundle.putString("id", "" + sbNotification.getId());
 
-              Object title = extras.get(Notification.EXTRA_TITLE);
+              Object title = BundleValueReader.getValue(extras, Notification.EXTRA_TITLE);
 
               if (title != null) {
                 notificationBundle.putString("title", title.toString());
               }
 
-              Object text = extras.get(Notification.EXTRA_TEXT);
+              Object text = BundleValueReader.getValue(extras, Notification.EXTRA_TEXT);
 
               if (text != null) {
                 notificationBundle.putString("body", text.toString());
               }
 
-              Object subtitle = extras.get(Notification.EXTRA_SUB_TEXT);
+              Object subtitle = BundleValueReader.getValue(extras, Notification.EXTRA_SUB_TEXT);
 
               if (subtitle != null) {
                 notificationBundle.putString("subtitle", subtitle.toString());
@@ -934,7 +926,8 @@ class NotificationManager {
 
               displayNotificationBundle.putString("id", "" + sbNotification.getId());
             } else {
-              displayNotificationBundle.putString("id", "" + notificationBundle.get("id"));
+              displayNotificationBundle.putString(
+                  "id", String.valueOf(BundleValueReader.getValue(notificationBundle, "id")));
             }
 
             if (triggerBundle != null) {
@@ -979,7 +972,7 @@ class NotificationManager {
       if (!shouldIncludeInData(key)) {
         continue;
       }
-      Object value = extras.get(key);
+      Object value = BundleValueReader.getValue(extras, key);
       if (value != null) {
         dataBundle.putString(key, value.toString());
       }

package/android/src/main/java/app/notifee/core/database/NotifeeCoreDatabase.java

@@ -43,10 +43,7 @@ public abstract class NotifeeCoreDatabase extends RoomDatabase {
   static final ListeningExecutorService databaseWriteListeningExecutor =
       MoreExecutors.listeningDecorator(databaseWriteExecutor);
 
-  /**
-   * Migrate from: version 1 to version 2 - where the {@link WorkDataEntity} has an extra field:
-   * alert
-   */
+  /** Migrate from version 1 to version 2 by adding the with_alarm_manager column. */
   @VisibleForTesting
   static final Migration MIGRATION_1_2 =
       new Migration(1, 2) {

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

@@ -23,7 +23,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
-import app.notifee.core.utility.ObjectUtils;
+import app.notifee.core.utility.BundleValueReader;
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -72,11 +72,8 @@ public class ChannelModel {
   }
 
   public Integer getImportance() {
-    if (mChannelBundle.containsKey("importance")) {
-      return ObjectUtils.getInt(mChannelBundle.get("importance"));
-    }
-
-    return NotificationManagerCompat.IMPORTANCE_DEFAULT;
+    return BundleValueReader.getIntPreserving(
+        mChannelBundle, "importance", NotificationManagerCompat.IMPORTANCE_DEFAULT);
   }
 
   public @Nullable Integer getLightColor() {
@@ -88,14 +85,11 @@ public class ChannelModel {
   }
 
   public int getVisibility() {
-    if (mChannelBundle.containsKey("visibility")) {
-      return ObjectUtils.getInt(mChannelBundle.get("visibility"));
-    }
-
-    return NotificationCompat.VISIBILITY_PRIVATE;
+    return BundleValueReader.getIntPreserving(
+        mChannelBundle, "visibility", NotificationCompat.VISIBILITY_PRIVATE);
   }
 
-  // Bundle.getParcelableArrayList returns ArrayList<?>, so the (Integer) cast is inherently
+  // BundleValueReader.getArrayListValue returns ArrayList<?>, so the (Integer) cast is inherently
   // unchecked but correct for our serialization format.
   @SuppressWarnings("unchecked")
   public long[] getVibrationPattern() {
@@ -104,7 +98,8 @@ public class ChannelModel {
     }
 
     ArrayList<?> vibrationPattern =
-        Objects.requireNonNull(mChannelBundle.getParcelableArrayList("vibrationPattern"));
+        Objects.requireNonNull(
+            BundleValueReader.getArrayListValue(mChannelBundle, "vibrationPattern"));
 
     long[] vibrateArray = new long[vibrationPattern.size()];
 

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

@@ -20,7 +20,7 @@ package app.notifee.core.model;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import app.notifee.core.Logger;
-import app.notifee.core.utility.ObjectUtils;
+import app.notifee.core.utility.BundleValueReader;
 import java.util.concurrent.TimeUnit;
 
 public class IntervalTriggerModel {
@@ -54,10 +54,6 @@ public class IntervalTriggerModel {
   }
 
   public int getInterval() {
-    if (mIntervalTriggerBundle.containsKey("interval")) {
-      return ObjectUtils.getInt(mIntervalTriggerBundle.get("interval"));
-    }
-
-    return -1;
+    return BundleValueReader.getIntPreserving(mIntervalTriggerBundle, "interval", -1);
   }
 }

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

@@ -29,7 +29,9 @@ import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import app.notifee.core.Logger;
+import app.notifee.core.utility.BundleValueReader;
 import app.notifee.core.utility.ObjectUtils;
+import app.notifee.core.utility.ParcelableCompatReader;
 import app.notifee.core.utility.ResourceUtils;
 import java.util.ArrayList;
 import java.util.Objects;
@@ -50,7 +52,9 @@ public class NotificationAndroidModel {
   public @Nullable ArrayList<NotificationAndroidActionModel> getActions() {
     if (mNotificationAndroidBundle.containsKey("actions")) {
       ArrayList<Bundle> actionBundles =
-          Objects.requireNonNull(mNotificationAndroidBundle.getParcelableArrayList("actions"));
+          Objects.requireNonNull(
+              ParcelableCompatReader.getParcelableArrayList(
+                  mNotificationAndroidBundle, "actions", Bundle.class));
       ArrayList<NotificationAndroidActionModel> actions = new ArrayList<>(actionBundles.size());
 
       for (Bundle actionBundle : actionBundles) {
@@ -72,7 +76,8 @@ public class NotificationAndroidModel {
 
     ArrayList<?> foregroundServiceTypesArrayList =
         Objects.requireNonNull(
-            mNotificationAndroidBundle.getParcelableArrayList("foregroundServiceTypes"));
+            BundleValueReader.getArrayListValue(
+                mNotificationAndroidBundle, "foregroundServiceTypes"));
 
     if (foregroundServiceTypesArrayList.isEmpty()) {
       Logger.w(TAG, "foregroundServiceTypes is empty; treating as absent");
@@ -137,12 +142,8 @@ public class NotificationAndroidModel {
    * @return Integer
    */
   public @Nullable Integer getBadgeIconType() {
-    if (mNotificationAndroidBundle.containsKey("badgeIconType")) {
-
-      return ObjectUtils.getInt(mNotificationAndroidBundle.get("badgeIconType"));
-    }
-
-    return NotificationCompat.BADGE_ICON_LARGE;
+    return BundleValueReader.getIntPreserving(
+        mNotificationAndroidBundle, "badgeIconType", NotificationCompat.BADGE_ICON_LARGE);
   }
 
   /**
@@ -266,11 +267,8 @@ public class NotificationAndroidModel {
    * @return int
    */
   public int getGroupAlertBehaviour() {
-    if (mNotificationAndroidBundle.containsKey("groupAlertBehavior")) {
-      return ObjectUtils.getInt(mNotificationAndroidBundle.get("groupAlertBehavior"));
-    }
-
-    return NotificationCompat.GROUP_ALERT_ALL;
+    return BundleValueReader.getIntPreserving(
+        mNotificationAndroidBundle, "groupAlertBehavior", NotificationCompat.GROUP_ALERT_ALL);
   }
 
   /**
@@ -327,14 +325,15 @@ public class NotificationAndroidModel {
    *
    * @return ArrayList<Integer>
    */
-  // Bundle.getParcelableArrayList returns ArrayList<?>, so element casts to String/Integer
+  // BundleValueReader.getArrayListValue returns ArrayList<?>, so element casts to String/Integer
   // are inherently unchecked but correct for our serialization format.
   @SuppressWarnings("unchecked")
   public @Nullable ArrayList<Integer> getLights() {
     if (mNotificationAndroidBundle.containsKey("lights")) {
       try {
         ArrayList<?> lightList =
-            Objects.requireNonNull(mNotificationAndroidBundle.getParcelableArrayList("lights"));
+            Objects.requireNonNull(
+                BundleValueReader.getArrayListValue(mNotificationAndroidBundle, "lights"));
         String rawColor = (String) lightList.get(0);
 
         ArrayList<Integer> lights = new ArrayList<>(3);
@@ -368,7 +367,7 @@ public class NotificationAndroidModel {
    */
   public Integer getNumber() {
     if (mNotificationAndroidBundle.containsKey("badgeCount")) {
-      return ObjectUtils.getInt(mNotificationAndroidBundle.get("badgeCount"));
+      return BundleValueReader.getIntPreserving(mNotificationAndroidBundle, "badgeCount");
     }
 
     return null;
@@ -403,7 +402,8 @@ public class NotificationAndroidModel {
     }
 
     ArrayList<?> flagsArrayList =
-        Objects.requireNonNull(mNotificationAndroidBundle.getParcelableArrayList("flags"));
+        Objects.requireNonNull(
+            BundleValueReader.getArrayListValue(mNotificationAndroidBundle, "flags"));
 
     int[] flagsArray = new int[flagsArrayList.size()];
 
@@ -469,7 +469,11 @@ public class NotificationAndroidModel {
       return NotificationCompat.PRIORITY_DEFAULT;
     }
 
-    int importance = ObjectUtils.getInt(mNotificationAndroidBundle.get("importance"));
+    int importance =
+        BundleValueReader.getIntPreserving(
+            mNotificationAndroidBundle,
+            "importance",
+            NotificationManagerCompat.IMPORTANCE_DEFAULT);
     switch (importance) {
       case NotificationManagerCompat.IMPORTANCE_HIGH:
         return NotificationCompat.PRIORITY_HIGH;
@@ -494,8 +498,8 @@ public class NotificationAndroidModel {
           Objects.requireNonNull(mNotificationAndroidBundle.getBundle("progress"));
 
       return new AndroidProgress(
-          ObjectUtils.getInt(progressBundle.get("max")),
-          ObjectUtils.getInt(progressBundle.get("current")),
+          BundleValueReader.getIntPreserving(progressBundle, "max"),
+          BundleValueReader.getIntPreserving(progressBundle, "current"),
           progressBundle.getBoolean("indeterminate", false));
     }
 
@@ -607,7 +611,7 @@ public class NotificationAndroidModel {
    */
   public @Nullable Long getTimeoutAfter() {
     if (mNotificationAndroidBundle.containsKey("timeoutAfter")) {
-      return ObjectUtils.getLong(mNotificationAndroidBundle.get("timeoutAfter"));
+      return BundleValueReader.getLongPreserving(mNotificationAndroidBundle, "timeoutAfter");
     }
 
     return null;
@@ -635,7 +639,7 @@ public class NotificationAndroidModel {
    *
    * @return long[]
    */
-  // Bundle.getParcelableArrayList returns ArrayList<?>, so the (Integer) cast is inherently
+  // BundleValueReader.getArrayListValue returns ArrayList<?>, so the (Integer) cast is inherently
   // unchecked but correct for our serialization format.
   @SuppressWarnings("unchecked")
   public long[] getVibrationPattern() {
@@ -645,7 +649,7 @@ public class NotificationAndroidModel {
 
     ArrayList<?> vibrationPattern =
         Objects.requireNonNull(
-            mNotificationAndroidBundle.getParcelableArrayList("vibrationPattern"));
+            BundleValueReader.getArrayListValue(mNotificationAndroidBundle, "vibrationPattern"));
 
     long[] vibrateArray = new long[vibrationPattern.size()];
 
@@ -663,11 +667,8 @@ public class NotificationAndroidModel {
    * @return int
    */
   public int getVisibility() {
-    if (mNotificationAndroidBundle.containsKey("visibility")) {
-      return ObjectUtils.getInt(mNotificationAndroidBundle.get("visibility"));
-    }
-
-    return NotificationCompat.VISIBILITY_PRIVATE;
+    return BundleValueReader.getIntPreserving(
+        mNotificationAndroidBundle, "visibility", NotificationCompat.VISIBILITY_PRIVATE);
   }
 
   /**
@@ -676,11 +677,7 @@ public class NotificationAndroidModel {
    * @return long
    */
   public long getTimestamp() {
-    if (mNotificationAndroidBundle.containsKey("timestamp")) {
-      return ObjectUtils.getLong(mNotificationAndroidBundle.get("timestamp"));
-    }
-
-    return -1;
+    return BundleValueReader.getLongPreserving(mNotificationAndroidBundle, "timestamp", -1L);
   }
 
   public static class AndroidProgress {

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/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/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)
             }
     }