expo-notifications 0.28.19 → 0.29.1

package/CHANGELOG.md

@@ -10,23 +10,45 @@
 
 ### 💡 Others
 
-## 0.28.19 — 2024-10-22
+## 0.29.1 — 2024-10-24
 
-### 🐛 Bug fixes
+_This version does not introduce any user-facing changes._
 
-- [android] fix: allow data message to control notification appearance ([#32162](https://github.com/expo/expo/pull/32162) by [@vonovak](https://github.com/vonovak))
+## 0.29.0 — 2024-10-22
+
+### 🛠 Breaking changes
 
-## 0.28.18 — 2024-10-01
+- Bumped iOS deployment target to 15.1. ([#30840](https://github.com/expo/expo/pull/30840), [#30862](https://github.com/expo/expo/pull/30862) by [@tsapeta](https://github.com/tsapeta))
+- Simplify calendar trigger input types. ([#31598](https://github.com/expo/expo/pull/31598) by [@douglowder](https://github.com/douglowder))
 
 ### 🎉 New features
 
 - Add clearLastNotificationResponseAsync to API. ([#31607](https://github.com/expo/expo/pull/31607) by [@douglowder](https://github.com/douglowder))
+- New monthly trigger type for scheduled notifications. ([#31823](https://github.com/expo/expo/pull/31823) by [@douglowder](https://github.com/douglowder))
 
 ### 🐛 Bug fixes
 
+- [android] fix: allow data message to control notification appearance ([#32162](https://github.com/expo/expo/pull/32162) by [@vonovak](https://github.com/vonovak))
+- [ios] fix crash if expo-update reload happens while Notifications.requestPermissionsAsync() is showing native dialog ([#32096](https://github.com/expo/expo/pull/32096) by [@mfazekas](https://github.com/mfazekas))
+- [android] `createNotificationChannel` could return incorrect channel information ([#32000](https://github.com/expo/expo/pull/32000) by [@vonovak](https://github.com/vonovak))
+- [android] fix notifications with `ChannelAwareTrigger` not being presented ([#31999](https://github.com/expo/expo/pull/31999) by [@vonovak](https://github.com/vonovak))
+- export `PermissionStatus` as value, not as type ([#31968](https://github.com/expo/expo/pull/31968) by [@vonovak](https://github.com/vonovak))
+- throw improved error on invalid subscription in removeNotificationSubscription ([#31842](https://github.com/expo/expo/pull/31842) by [@vonovak](https://github.com/vonovak))
 - [android] fix notifications actions not being presented ([#31795](https://github.com/expo/expo/pull/31795) by [@vonovak](https://github.com/vonovak))
+- Add missing `react` and `react-native` peer dependencies for isolated modules. ([#30478](https://github.com/expo/expo/pull/30478) by [@byCedric](https://github.com/byCedric))
+- [iOS] do not overwrite existing aps entitlement. ([#31892](https://github.com/expo/expo/pull/31892) by [@douglowder](https://github.com/douglowder))
+
+### 💡 Others
 
-## 0.28.17 — 2024-09-17
+- warn when using push tokens in Expo Go ([#32122](https://github.com/expo/expo/pull/32122) by [@vonovak](https://github.com/vonovak))
+- [android] refactor trigger serialization ([#32032](https://github.com/expo/expo/pull/32032) by [@vonovak](https://github.com/vonovak))
+- [android] simplify DateTrigger ([#32002](https://github.com/expo/expo/pull/32002) by [@vonovak](https://github.com/vonovak))
+- [android] refactor ExpoNotificationBuilder ([#31838](https://github.com/expo/expo/pull/31838) by [@vonovak](https://github.com/vonovak))
+- Warn about limited support in Expo Go ([#31573](https://github.com/expo/expo/pull/31573) by [@vonovak](https://github.com/vonovak))
+- Keep using the legacy event emitter as the module is not fully migrated to Expo Modules API. ([#28946](https://github.com/expo/expo/pull/28946) by [@tsapeta](https://github.com/tsapeta))
+- [Android] Convert trigger Java classes to Kotlin. ([#31856](https://github.com/expo/expo/pull/31856) by [@douglowder](https://github.com/douglowder))
+
+## 0.28.17 - 2024-09-17
 
 ### 🐛 Bug fixes
 
@@ -34,55 +56,54 @@
 - [Android] fix local notifications with null trigger. ([#31157](https://github.com/expo/expo/pull/31157) by [@douglowder](https://github.com/douglowder))
 - [Android] Take `channelId` into account when presenting notifications. ([#31201](https://github.com/expo/expo/pull/31201) by [@vonovak](https://github.com/vonovak))
 
-## 0.28.16 — 2024-08-21
+## 0.28.16 - 2024-08-21
 
 ### 🐛 Bug fixes
 
 - [Android] Fix content.data in scheduled notifications surfaced to JS. ([#31048](https://github.com/expo/expo/pull/31048) by [@douglowder](https://github.com/douglowder))
 
-## 0.28.15 — 2024-08-05
+## 0.28.15 - 2024-08-05
 
 ### 🐛 Bug fixes
 
 - [Android] Eliminate unsupported types when processing notification intents from onCreate/onNewIntent. ([#30750](https://github.com/expo/expo/pull/30750) by [@douglowder](https://github.com/douglowder))
 
-## 0.28.14 — 2024-07-30
+## 0.28.14 - 2024-07-30
 
 ### 🐛 Bug fixes
 
 - `useLastNotificationResponse` should have only one effect. ([#30653](https://github.com/expo/expo/pull/30653) by [@douglowder](https://github.com/douglowder))
 
-## 0.28.13 — 2024-07-29
+## 0.28.13 - 2024-07-29
 
 ### 🐛 Bug fixes
 
 - [Android] map Expo and Firebase notifications correctly. ([#30615](https://github.com/expo/expo/pull/30615) by [@douglowder](https://github.com/douglowder))
-- [Android] Apply requested changes from #30615. ([#30658](https://github.com/expo/expo/pull/30615) by [@lukmccall](https://github.com/lukmccall))
 
-## 0.28.12 — 2024-07-25
+## 0.28.12 - 2024-07-25
 
 ### 🐛 Bug fixes
 
 - [Android] Android 11 crash when click foreground notifications. ([#30207](https://github.com/expo/expo/pull/30207) by [@GrinZero](https://github.com/GrinZero))
 - Notification's textInput content would contain `placeholder` instead of the actual user input ([#27479](https://github.com/expo/expo/pull/27479) by [@Victor-FT](https://github.com/Victor-FT))
 
-## 0.28.11 — 2024-07-22
+## 0.28.11 - 2024-07-22
 
 ### 🐛 Bug fixes
 
 - [Android] Fix serialization of vibration pattern. ([#30495](https://github.com/expo/expo/pull/30495) by [@douglowder](https://github.com/douglowder))
 
-## 0.28.10 — 2024-07-15
+## 0.28.10 - 2024-07-15
 
 ### 🐛 Bug fixes
 
 - [Android] fix getLastNotificationResponseAsync. ([#30301](https://github.com/expo/expo/pull/30301) by [@douglowder](https://github.com/douglowder))
 
-## 0.28.9 — 2024-06-12
+## 0.28.9 - 2024-06-12
 
 _This version does not introduce any user-facing changes._
 
-## 0.28.8 — 2024-06-10
+## 0.28.8 - 2024-06-10
 
 ### 🐛 Bug fixes
 
@@ -112,6 +133,8 @@ _This version does not introduce any user-facing changes._
 
 - [Android] Correctly map response in useLastNotificationResponse hook. ([#28938](https://github.com/expo/expo/pull/28938) by [@douglowder](https://github.com/douglowder))
 
+## 0.28.3 — 2024-05-16
+
 ### 💡 Others
 
 - [iOS] Add support for `interruptionLevel`. ([#28921](https://github.com/expo/expo/pull/28921) by [@lukmccall](https://github.com/lukmccall))
@@ -286,6 +309,7 @@ _This version does not introduce any user-facing changes._
 
 ### 🛠 Breaking changes
 
+- remove `usePermissions` hook ([#31905](https://github.com/expo/expo/pull/31905) by [@vonovak](https://github.com/vonovak))
 - [android] Set the "notification number" (sometimes used to increment badge count on some launchers) from the notification payload `badge` field. ([#17171](https://github.com/expo/expo/pull/17171) by [@danstepanov](https://github.com/danstepanov))
 
 ### 🐛 Bug fixes

package/README.md

@@ -50,7 +50,7 @@ In order to be able to receive push notifications on the device:
 
 ### Configure for Android
 
-In order to be able to receive push notifications on the device ensure that your project is set up for Firebase. For more information on how to do it, see [this guide](https://docs.expo.dev/guides/setup-native-firebase/#bare-workflow-setup).
+In order to be able to receive push notifications on the device ensure that your project is set up for Firebase. For more information on how to do it, see [this guide](https://docs.expo.dev/guides/using-firebase/#install-and-initialize-react-native-firebase).
 
 This module requires permission to subscribe to device boot. It's used to setup the scheduled notifications right after the device (re)starts. The `RECEIVE_BOOT_COMPLETED` permission is added automatically.
 
@@ -825,7 +825,6 @@ An optional object of conforming to the following interface:
     allowCriticalAlerts?: boolean;
     provideAppNotificationSettings?: boolean;
     allowProvisional?: boolean;
-    allowAnnouncements?: boolean;
   }
 }
 ```
@@ -849,7 +848,6 @@ export function requestPermissionsAsync() {
       allowAlert: true,
       allowBadge: true,
       allowSound: true,
-      allowAnnouncements: true,
     },
   });
 }

package/android/build.gradle

@@ -1,7 +1,8 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-parcelize'
 
 group = 'host.exp.exponent'
-version = '0.28.19'
+version = '0.29.1'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +15,7 @@ android {
   namespace "expo.modules.notifications"
   defaultConfig {
     versionCode 21
-    versionName '0.28.19'
+    versionName '0.29.1'
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
 

package/android/src/main/java/expo/modules/notifications/Utils.kt

@@ -90,11 +90,11 @@ internal fun isValidJSONString(test: Any?): Boolean {
   when (test is String) {
     true -> {
       try {
-        JSONObject(test as String)
+        JSONObject(test)
         return true
       } catch (objectEx: JSONException) {
         try {
-          JSONArray(test as String)
+          JSONArray(test)
           return true
         } catch (arrayEx: JSONException) {
           return false

package/android/src/main/java/expo/modules/notifications/notifications/NotificationManager.java

@@ -30,6 +30,10 @@ public class NotificationManager implements SingletonModule, expo.modules.notifi
   public NotificationManager() {
     mListenerReferenceMap = new WeakHashMap<>();
 
+    // TODO @vonovak there's a chain of listeners:
+    //  ExpoHandlingDelegate -> NotificationManager -> NotificationsEmitter
+    //                                              -> NotificationsHandler
+    // it seems it could be shorter?
     // Registers this singleton instance in static ExpoHandlingDelegate listeners collection.
     // Since it doesn't hold strong reference to the object this should be safe.
     ExpoHandlingDelegate.Companion.addListener(this);
@@ -81,6 +85,10 @@ public class NotificationManager implements SingletonModule, expo.modules.notifi
    * Calls {@link NotificationListener#onNotificationReceived(Notification)} on all values
    * of {@link NotificationManager#mListenerReferenceMap}.
    *
+   * In practice, that means calling {@link NotificationsEmitter} (just emits an event to JS) and
+   * {@link NotificationsHandler} which calls `handleNotification` in JS to determine the behavior.
+   * Then `SingleNotificationHandlerTask.processNotificationWithBehavior` may present it.
+   *
    * @param notification Notification received
    */
   public void onNotificationReceived(Notification notification) {

package/android/src/main/java/expo/modules/notifications/notifications/NotificationSerializer.java

@@ -32,6 +32,7 @@ import expo.modules.notifications.notifications.model.triggers.FirebaseNotificat
 
 import expo.modules.notifications.notifications.triggers.DailyTrigger;
 import expo.modules.notifications.notifications.triggers.DateTrigger;
+import expo.modules.notifications.notifications.triggers.MonthlyTrigger;
 import expo.modules.notifications.notifications.triggers.TimeIntervalTrigger;
 import expo.modules.notifications.notifications.triggers.WeeklyTrigger;
 import expo.modules.notifications.notifications.triggers.YearlyTrigger;
@@ -57,11 +58,12 @@ public class NotificationSerializer {
   public static Bundle toBundle(NotificationRequest request) {
     Bundle serializedRequest = new Bundle();
     serializedRequest.putString("identifier", request.getIdentifier());
-    serializedRequest.putBundle("trigger", toBundle(request.getTrigger()));
+    NotificationTrigger requestTrigger = request.getTrigger();
+    serializedRequest.putBundle("trigger", requestTrigger == null ? null : requestTrigger.toBundle());
     Bundle content = toBundle(request.getContent());
     Bundle existingContentData = content.getBundle("data");
     if (existingContentData == null) {
-      if(request.getTrigger() instanceof FirebaseNotificationTrigger trigger) {
+      if(requestTrigger instanceof FirebaseNotificationTrigger trigger) {
         RemoteMessage message = trigger.getRemoteMessage();
         RemoteMessage.Notification notification = message.getNotification();
         Map<String, String> data = message.getData();
@@ -76,8 +78,8 @@ public class NotificationSerializer {
           content.putBundle("data", toBundle(data));
         }
       } else if(
-        request.getTrigger() instanceof SchedulableNotificationTrigger ||
-          request.getTrigger() == null
+        requestTrigger instanceof SchedulableNotificationTrigger ||
+          requestTrigger == null
       ) {
         JSONObject body = request.getContent().getBody();
         if (body != null) {
@@ -101,7 +103,7 @@ public class NotificationSerializer {
   public static Bundle toBundle(INotificationContent content) {
     Bundle serializedContent = new Bundle();
     serializedContent.putString("title", content.getTitle());
-    serializedContent.putString("subtitle", content.getSubtitle());
+    serializedContent.putString("subtitle", content.getSubText());
     serializedContent.putString("body", content.getText());
     if (content.getColor() != null) {
       serializedContent.putString("color", String.format("#%08X", content.getColor().intValue()));
@@ -186,50 +188,6 @@ public class NotificationSerializer {
     return result;
   }
 
-  private static Bundle toBundle(@Nullable NotificationTrigger trigger) {
-    if (trigger == null) {
-      return null;
-    }
-    Bundle bundle = new Bundle();
-    if (trigger instanceof FirebaseNotificationTrigger) {
-      bundle.putString("type", "push");
-      bundle.putBundle("remoteMessage", RemoteMessageSerializer.toBundle(((FirebaseNotificationTrigger) trigger).getRemoteMessage()));
-    } else if (trigger instanceof TimeIntervalTrigger) {
-      bundle.putString("type", "timeInterval");
-      bundle.putBoolean("repeats", ((TimeIntervalTrigger) trigger).isRepeating());
-      bundle.putLong("seconds", ((TimeIntervalTrigger) trigger).getTimeInterval());
-    } else if (trigger instanceof DateTrigger) {
-      bundle.putString("type", "date");
-      bundle.putBoolean("repeats", false);
-      bundle.putLong("value", ((DateTrigger) trigger).getTriggerDate().getTime());
-    } else if (trigger instanceof DailyTrigger) {
-      bundle.putString("type", "daily");
-      bundle.putInt("hour", ((DailyTrigger) trigger).getHour());
-      bundle.putInt("minute", ((DailyTrigger) trigger).getMinute());
-    } else if (trigger instanceof WeeklyTrigger) {
-      bundle.putString("type", "weekly");
-      bundle.putInt("weekday", ((WeeklyTrigger) trigger).getWeekday());
-      bundle.putInt("hour", ((WeeklyTrigger) trigger).getHour());
-      bundle.putInt("minute", ((WeeklyTrigger) trigger).getMinute());
-    } else if (trigger instanceof YearlyTrigger) {
-      bundle.putString("type", "yearly");
-      bundle.putInt("day", ((YearlyTrigger) trigger).getDay());
-      bundle.putInt("month", ((YearlyTrigger) trigger).getMonth());
-      bundle.putInt("hour", ((YearlyTrigger) trigger).getHour());
-      bundle.putInt("minute", ((YearlyTrigger) trigger).getMinute());
-    } else {
-      bundle.putString("type", "unknown");
-    }
-    bundle.putString("channelId", getChannelId(trigger));
-
-    return bundle;
-  }
-
-  @Nullable
-  private static String getChannelId(NotificationTrigger trigger) {
-    return trigger.getNotificationChannel();
-  }
-
   @NotNull
   public static Bundle toResponseBundleFromExtras(Bundle extras) {
     Bundle serializedContent = new Bundle();

package/android/src/main/java/expo/modules/notifications/notifications/background/BackgroundRemoteNotificationTaskConsumer.java

@@ -25,9 +25,10 @@ import expo.modules.interfaces.taskManager.TaskManagerUtilsInterface;
 /**
  * Represents a task to be run when the app is receives a remote push
  * notification. Map of current tasks is maintained in {@link FirebaseMessagingDelegate}.
+ *
+ * Instances are instantiated by expo task manager, after being registered in ExpoBackgroundNotificationTasksModule
  */
 public class BackgroundRemoteNotificationTaskConsumer extends TaskConsumer implements TaskConsumerInterface {
-  private static final String TAG = BackgroundRemoteNotificationTaskConsumer.class.getSimpleName();
   private static final String NOTIFICATION_KEY = "notification";
 
   private TaskInterface mTask;

package/android/src/main/java/expo/modules/notifications/notifications/channels/AbstractNotificationsChannelsProvider.java

@@ -2,25 +2,13 @@ package expo.modules.notifications.notifications.channels;
 
 import android.content.Context;
 
-import expo.modules.core.ModuleRegistry;
 import expo.modules.core.interfaces.InternalModule;
 
 import java.util.Collections;
 import java.util.List;
 
-import expo.modules.notifications.notifications.channels.managers.NotificationsChannelGroupManager;
-import expo.modules.notifications.notifications.channels.managers.NotificationsChannelManager;
-import expo.modules.notifications.notifications.channels.serializers.NotificationsChannelGroupSerializer;
-import expo.modules.notifications.notifications.channels.serializers.NotificationsChannelSerializer;
-
 public abstract class AbstractNotificationsChannelsProvider implements NotificationsChannelsProvider, InternalModule {
   protected final Context mContext;
-  private NotificationsChannelManager mChannelManager;
-  private NotificationsChannelGroupManager mChannelGroupManager;
-  private NotificationsChannelSerializer mChannelSerializer;
-  private NotificationsChannelGroupSerializer mChannelGroupSerializer;
-
-  private ModuleRegistry mModuleRegistry;
 
   public AbstractNotificationsChannelsProvider(Context context) {
     mContext = context;
@@ -30,52 +18,4 @@ public abstract class AbstractNotificationsChannelsProvider implements Notificat
     return Collections.singletonList(NotificationsChannelsProvider.class);
   }
 
-  @Override
-  public void onCreate(ModuleRegistry moduleRegistry) {
-    mModuleRegistry = moduleRegistry;
-  }
-
-  public final ModuleRegistry getModuleRegistry() {
-    return mModuleRegistry;
-  }
-
-  @Override
-  public final NotificationsChannelManager getChannelManager() {
-    if (mChannelManager == null) {
-      mChannelManager = createChannelManager();
-    }
-    return mChannelManager;
-  }
-
-  @Override
-  public final NotificationsChannelGroupManager getGroupManager() {
-    if (mChannelGroupManager == null) {
-      mChannelGroupManager = createChannelGroupManager();
-    }
-    return mChannelGroupManager;
-  }
-
-  @Override
-  public final NotificationsChannelSerializer getChannelSerializer() {
-    if (mChannelSerializer == null) {
-      mChannelSerializer = createChannelSerializer();
-    }
-    return mChannelSerializer;
-  }
-
-  @Override
-  public final NotificationsChannelGroupSerializer getGroupSerializer() {
-    if (mChannelGroupSerializer == null) {
-      mChannelGroupSerializer = createChannelGroupSerializer();
-    }
-    return mChannelGroupSerializer;
-  }
-
-  protected abstract NotificationsChannelManager createChannelManager();
-
-  protected abstract NotificationsChannelGroupManager createChannelGroupManager();
-
-  protected abstract NotificationsChannelSerializer createChannelSerializer();
-
-  protected abstract NotificationsChannelGroupSerializer createChannelGroupSerializer();
 }

package/android/src/main/java/expo/modules/notifications/notifications/channels/AndroidXNotificationsChannelsProvider.kt

@@ -0,0 +1,26 @@
+package expo.modules.notifications.notifications.channels
+
+import android.content.Context
+import expo.modules.notifications.notifications.channels.managers.AndroidXNotificationsChannelGroupManager
+import expo.modules.notifications.notifications.channels.managers.AndroidXNotificationsChannelManager
+import expo.modules.notifications.notifications.channels.serializers.ExpoNotificationsChannelGroupSerializer
+import expo.modules.notifications.notifications.channels.serializers.ExpoNotificationsChannelSerializer
+
+class AndroidXNotificationsChannelsProvider(context: Context) : AbstractNotificationsChannelsProvider(context) {
+
+  override val groupManager by lazy {
+    AndroidXNotificationsChannelGroupManager(context)
+  }
+
+  override val channelManager by lazy {
+    AndroidXNotificationsChannelManager(context, groupManager)
+  }
+
+  override val channelSerializer by lazy {
+    ExpoNotificationsChannelSerializer()
+  }
+
+  override val groupSerializer by lazy {
+    ExpoNotificationsChannelGroupSerializer(channelSerializer)
+  }
+}

package/android/src/main/java/expo/modules/notifications/notifications/channels/NotificationsChannelsProvider.kt

@@ -0,0 +1,13 @@
+package expo.modules.notifications.notifications.channels
+
+import expo.modules.notifications.notifications.channels.managers.NotificationsChannelGroupManager
+import expo.modules.notifications.notifications.channels.managers.NotificationsChannelManager
+import expo.modules.notifications.notifications.channels.serializers.NotificationsChannelGroupSerializer
+import expo.modules.notifications.notifications.channels.serializers.NotificationsChannelSerializer
+
+interface NotificationsChannelsProvider {
+  val channelManager: NotificationsChannelManager
+  val groupManager: NotificationsChannelGroupManager
+  val channelSerializer: NotificationsChannelSerializer
+  val groupSerializer: NotificationsChannelGroupSerializer
+}

package/android/src/main/java/expo/modules/notifications/notifications/channels/managers/AndroidXNotificationsChannelGroupManager.java

@@ -54,10 +54,9 @@ public class AndroidXNotificationsChannelGroupManager implements NotificationsCh
   // Processing options
   @RequiresApi(api = Build.VERSION_CODES.O)
   protected void configureGroupWithOptions(Object maybeGroup, ReadableArguments groupOptions) {
-    if (!(maybeGroup instanceof NotificationChannelGroup)) {
+    if (!(maybeGroup instanceof NotificationChannelGroup group)) {
       return;
     }
-    NotificationChannelGroup group = (NotificationChannelGroup) maybeGroup;
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
       if (groupOptions.containsKey(DESCRIPTION_KEY)) {
         group.setDescription(groupOptions.getString(DESCRIPTION_KEY));

package/android/src/main/java/expo/modules/notifications/notifications/channels/managers/AndroidXNotificationsChannelManager.java

@@ -80,7 +80,10 @@ public class AndroidXNotificationsChannelManager implements NotificationsChannel
     NotificationChannel channel = new NotificationChannel(channelId, name, importance);
     configureChannelWithOptions(channel, channelOptions);
     mNotificationManager.createNotificationChannel(channel);
-    return channel;
+    // We return the channel given by mNotificationManager, not the one we created.
+    // see "Note that the created channel may differ from this value." ("this value" = the one we provided)
+    // https://developer.android.com/reference/android/app/NotificationManager#createNotificationChannel(android.app.NotificationChannel)
+    return mNotificationManager.getNotificationChannel(channelId);
   }
 
   // Processing options

package/android/src/main/java/expo/modules/notifications/notifications/debug/DebugLogging.kt

@@ -70,10 +70,10 @@ object DebugLogging {
       """
       $caller:
         notification.notificationRequest.content.title: ${notification.notificationRequest.content.title}
-        notification.notificationRequest.content.subtitle: ${notification.notificationRequest.content.subtitle}
+        notification.notificationRequest.content.subText: ${notification.notificationRequest.content.subText}
         notification.notificationRequest.content.text: ${notification.notificationRequest.content.text}
         notification.notificationRequest.content.sound: ${notification.notificationRequest.content.soundName}
-        notification.notificationRequest.content.channelID: ${notification.notificationRequest.trigger.notificationChannel}
+        notification.notificationRequest.content.channelID: ${notification.notificationRequest.trigger.getNotificationChannel()}
         notification.notificationRequest.content.body: ${notification.notificationRequest.content.body}
         notification.notificationRequest.content.color: ${notification.notificationRequest.content.color}
         notification.notificationRequest.content.vibrationPattern: ${notification.notificationRequest.content.vibrationPattern?.contentToString()}

package/android/src/main/java/expo/modules/notifications/notifications/handling/NotificationsHandler.kt

@@ -99,7 +99,7 @@ open class NotificationsHandler : Module(), NotificationListener {
       ?: throw NotificationWasAlreadyHandledException(identifier)
 
     with(behavior) {
-      task.handleResponse(
+      task.processNotificationWithBehavior(
         NotificationBehavior(shouldShowAlert, shouldPlaySound, shouldSetBadge, priority),
         promise
       )
@@ -110,6 +110,8 @@ open class NotificationsHandler : Module(), NotificationListener {
    * Callback called by [NotificationManager] to inform its listeners of new messages.
    * Starts up a new [SingleNotificationHandlerTask] which will take it on from here.
    *
+   * SingleNotificationHandlerTask.processNotificationWithBehavior can then present it
+   *
    * @param notification Notification received
    */
   override fun onNotificationReceived(notification: Notification) {

package/android/src/main/java/expo/modules/notifications/notifications/handling/SingleNotificationHandlerTask.java

@@ -34,7 +34,6 @@ public class SingleNotificationHandlerTask {
   private Handler mHandler;
   private EventEmitter mEventEmitter;
   private Notification mNotification;
-  private NotificationBehavior mBehavior;
   private Context mContext;
   private NotificationsHandler mDelegate;
 
@@ -88,12 +87,11 @@ public class SingleNotificationHandlerTask {
    * @param behavior Behavior requested by the app
    * @param promise  Promise to fulfill once the behavior is applied to the notification.
    */
-  /* package */ void handleResponse(NotificationBehavior behavior, final Promise promise) {
-    mBehavior = behavior;
+  /* package */ void processNotificationWithBehavior(final NotificationBehavior behavior, final Promise promise) {
     mHandler.post(new Runnable() {
       @Override
       public void run() {
-        NotificationsService.Companion.present(mContext, mNotification, mBehavior, new ResultReceiver(mHandler) {
+        NotificationsService.Companion.present(mContext, mNotification, behavior, new ResultReceiver(mHandler) {
           @Override
           protected void onReceiveResult(int resultCode, Bundle resultData) {
             super.onReceiveResult(resultCode, resultData);

package/android/src/main/java/expo/modules/notifications/notifications/interfaces/INotificationContent.kt

@@ -17,7 +17,7 @@ import org.json.JSONObject
 interface INotificationContent : Parcelable {
   val title: String?
   val text: String?
-  val subtitle: String?
+  val subText: String?
   val badgeCount: Number?
   val shouldPlayDefaultSound: Boolean
 
@@ -27,7 +27,7 @@ interface INotificationContent : Parcelable {
   val shouldUseDefaultVibrationPattern: Boolean
   val vibrationPattern: LongArray?
   val body: JSONObject?
-  val priority: NotificationPriority
+  val priority: NotificationPriority?
   val color: Number?
   val isAutoDismiss: Boolean
   val categoryId: String?

package/android/src/main/java/expo/modules/notifications/notifications/interfaces/NotificationBuilder.kt

@@ -8,14 +8,6 @@ import expo.modules.notifications.notifications.model.NotificationBehavior
  * on a [NotificationContent] spec.
  */
 interface NotificationBuilder {
-  /**
-   * Pass in a [Notification] based on which the Android notification should be based.
-   *
-   * @param notification [Notification] on which the notification should be based.
-   * @return The same instance of [NotificationBuilder] updated with the notification.
-   */
-  fun setNotification(notification: Notification?): NotificationBuilder?
-
   /**
    * Pass in a [NotificationBehavior] if you want to override the behavior
    * of the notification, i.e. whether it should show a heads-up alert, set badge, etc.
@@ -23,7 +15,7 @@ interface NotificationBuilder {
    * @param behavior [NotificationBehavior] to which the presentation effect should conform.
    * @return The same instance of [NotificationBuilder] updated with the remote message.
    */
-  fun setAllowedBehavior(behavior: NotificationBehavior?): NotificationBuilder?
+  fun setAllowedBehavior(behavior: NotificationBehavior?): NotificationBuilder
 
   /**
    * Builds the Android notification based on passed in data.

package/android/src/main/java/expo/modules/notifications/notifications/interfaces/NotificationListener.java

@@ -13,7 +13,7 @@ import expo.modules.notifications.notifications.model.NotificationResponse;
  */
 public interface NotificationListener {
   /**
-   * Callback called when new notification is received.
+   * Callback called when new notification is received while the app is in foreground.
    *
    * @param notification Notification received
    */

package/android/src/main/java/expo/modules/notifications/notifications/interfaces/NotificationTrigger.kt

@@ -0,0 +1,19 @@
+package expo.modules.notifications.notifications.interfaces
+
+import android.os.Bundle
+import android.os.Parcelable
+
+/**
+ * An interface specifying source of the notification, to be implemented
+ * by concrete classes.
+ */
+interface NotificationTrigger : Parcelable {
+  // these are functions so that we're absolutely sure @Parcelize doesn't try to parcelize them
+  // (as opposed to if they were properties)
+
+  fun getNotificationChannel(): String? {
+    return null
+  }
+
+  fun toBundle(): Bundle
+}

package/android/src/main/java/expo/modules/notifications/notifications/model/NotificationAction.java

@@ -7,6 +7,9 @@ import java.io.Serializable;
 
 /**
  * A class representing a single notification action button.
+ *
+ * TODO vonovak: no need to implement serializable, parcelable is enough for storing
+ *
  */
 public class NotificationAction implements Parcelable, Serializable {
   private final String mIdentifier;

package/android/src/main/java/expo/modules/notifications/notifications/model/NotificationCategory.java

@@ -9,6 +9,8 @@ import java.util.List;
 
 /**
  * A class representing a collection of notification actions.
+ *
+ * TODO vonovak: no need to implement serializable, parcelable is enough for storing
  */
 public class NotificationCategory implements Parcelable, Serializable {
   private final String mIdentifier;