expo-notifications 1.0.0-canary-20240927-ab8a962 → 1.0.0-canary-20241008-90b13ad

package/CHANGELOG.md

@@ -10,13 +10,18 @@
 ### 🎉 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
 
+- 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
 
+- [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))
 

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;
@@ -101,7 +102,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()));
@@ -211,6 +212,11 @@ public class NotificationSerializer {
       bundle.putInt("weekday", ((WeeklyTrigger) trigger).getWeekday());
       bundle.putInt("hour", ((WeeklyTrigger) trigger).getHour());
       bundle.putInt("minute", ((WeeklyTrigger) trigger).getMinute());
+    } else if (trigger instanceof MonthlyTrigger) {
+      bundle.putString("type", "monthly");
+      bundle.putInt("day", ((MonthlyTrigger) trigger).getDay());
+      bundle.putInt("hour", ((MonthlyTrigger) trigger).getHour());
+      bundle.putInt("minute", ((MonthlyTrigger) trigger).getMinute());
     } else if (trigger instanceof YearlyTrigger) {
       bundle.putString("type", "yearly");
       bundle.putInt("day", ((YearlyTrigger) trigger).getDay());

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/debug/DebugLogging.kt

@@ -70,7 +70,7 @@ 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}

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/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;

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

@@ -75,7 +75,7 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
   }
 
   @Nullable
-  public String getSubtitle() {
+  public String getSubText() {
     return mSubtitle;
   }
 

package/android/src/main/java/expo/modules/notifications/notifications/model/RemoteNotificationContent.kt

@@ -75,7 +75,7 @@ class RemoteNotificationContent(private val remoteMessage: RemoteMessage) : INot
   override val isSticky: Boolean
     get() = remoteMessage.data["sticky"]?.toBoolean() ?: false
 
-  override val subtitle: String?
+  override val subText: String?
     get() = remoteMessage.data["subtitle"]
 
   override val badgeCount: Number?

package/android/src/main/java/expo/modules/notifications/notifications/presentation/ExpoNotificationPresentationModule.kt

@@ -11,6 +11,8 @@ import expo.modules.notifications.ResultReceiverBody
 import expo.modules.notifications.createDefaultResultReceiver
 import expo.modules.notifications.notifications.ArgumentsNotificationContentBuilder
 import expo.modules.notifications.notifications.NotificationSerializer
+import expo.modules.notifications.notifications.interfaces.INotificationContent
+import expo.modules.notifications.notifications.interfaces.NotificationTrigger
 import expo.modules.notifications.notifications.model.Notification
 import expo.modules.notifications.notifications.model.NotificationRequest
 import expo.modules.notifications.service.NotificationsService
@@ -31,7 +33,7 @@ open class ExpoNotificationPresentationModule : Module() {
 
     AsyncFunction("presentNotificationAsync") { identifier: String, payload: ReadableArguments, promise: Promise ->
       val content = ArgumentsNotificationContentBuilder(context).setPayload(payload).build()
-      val request = NotificationRequest(identifier, content, null)
+      val request = createNotificationRequest(identifier, content, null)
       val notification = Notification(request)
       present(
         context,
@@ -54,7 +56,7 @@ open class ExpoNotificationPresentationModule : Module() {
         createResultReceiver { resultCode: Int, resultData: Bundle? ->
           val notifications = resultData?.getParcelableArrayList<Notification>(NotificationsService.NOTIFICATIONS_KEY)
           if (resultCode == NotificationsService.SUCCESS_CODE && notifications != null) {
-            promise.resolve(notifications.map(NotificationSerializer::toBundle))
+            promise.resolve(serializeNotifications(notifications))
           } else {
             val e = resultData?.getSerializable(NotificationsService.EXCEPTION_KEY) as? Exception
             promise.reject("ERR_NOTIFICATIONS_FETCH_FAILED", "A list of displayed notifications could not be fetched.", e)
@@ -96,4 +98,16 @@ open class ExpoNotificationPresentationModule : Module() {
       }
     )
   }
+
+  protected open fun createNotificationRequest(
+    identifier: String,
+    content: INotificationContent,
+    trigger: NotificationTrigger?
+  ): NotificationRequest {
+    return NotificationRequest(identifier, content, null)
+  }
+
+  protected open fun serializeNotifications(notifications: Collection<Notification>): List<Bundle> {
+    return notifications.map(NotificationSerializer::toBundle)
+  }
 }

package/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/BaseNotificationBuilder.kt

@@ -0,0 +1,148 @@
+package expo.modules.notifications.notifications.presentation.builders
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
+import android.util.Log
+import androidx.annotation.RequiresApi
+import androidx.core.app.NotificationCompat
+import expo.modules.notifications.R
+import expo.modules.notifications.notifications.channels.managers.AndroidXNotificationsChannelGroupManager
+import expo.modules.notifications.notifications.channels.managers.AndroidXNotificationsChannelManager
+import expo.modules.notifications.notifications.channels.managers.NotificationsChannelManager
+import expo.modules.notifications.notifications.interfaces.INotificationContent
+import expo.modules.notifications.notifications.interfaces.NotificationBuilder
+import expo.modules.notifications.notifications.model.Notification
+import expo.modules.notifications.notifications.model.NotificationBehavior
+
+/**
+ * A foundation class for [NotificationBuilder] implementations. Takes care
+ * of accepting [.mNotification] and [.mNotificationBehavior].
+ */
+abstract class BaseNotificationBuilder protected constructor(protected val context: Context, protected val notification: Notification) :
+  NotificationBuilder {
+
+  protected var notificationBehavior: NotificationBehavior? = null
+    private set
+
+  override fun setAllowedBehavior(behavior: NotificationBehavior?): NotificationBuilder {
+    notificationBehavior = behavior
+    return this
+  }
+
+  fun createBuilder(): NotificationCompat.Builder {
+    val builder = channelId?.let { NotificationCompat.Builder(context, it) } ?: NotificationCompat.Builder(context)
+    return builder
+  }
+
+  protected val channelId: String?
+    /**
+     * @return A [NotificationChannel]'s identifier to use for the notification.
+     */
+    get() {
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+        // Returning null on incompatible platforms won't be an error.
+        return null
+      }
+
+      val trigger = notification.notificationRequest?.trigger
+      if (trigger == null) {
+        Log.e(
+          "notifications",
+          String.format(
+            "Couldn't get channel for the notifications - trigger is 'null'. Fallback to '%s' channel",
+            FALLBACK_CHANNEL_ID
+          )
+        )
+        return fallbackNotificationChannel!!.id
+      }
+
+      val requestedChannelId = trigger.notificationChannel
+        ?: return fallbackNotificationChannel!!.id
+
+      val channelForRequestedId =
+        notificationsChannelManager.getNotificationChannel(requestedChannelId)
+      if (channelForRequestedId == null) {
+        Log.e(
+          "notifications",
+          String.format(
+            "Channel '%s' doesn't exists. Fallback to '%s' channel",
+            requestedChannelId,
+            FALLBACK_CHANNEL_ID
+          )
+        )
+        return fallbackNotificationChannel!!.id
+      }
+
+      return channelForRequestedId.id
+    }
+
+  open val notificationsChannelManager: NotificationsChannelManager
+    get() = AndroidXNotificationsChannelManager(
+      context,
+      AndroidXNotificationsChannelGroupManager(context)
+    )
+
+  private val fallbackNotificationChannel: NotificationChannel?
+    /**
+     * Fetches the fallback notification channel, and if it doesn't exist yet - creates it.
+     *
+     *
+     * Returns null on [NotificationChannel]-incompatible platforms.
+     *
+     * @return Fallback [NotificationChannel] or null.
+     */
+    get() {
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+        return null
+      }
+
+      val channel = notificationManager.getNotificationChannel(FALLBACK_CHANNEL_ID)
+      return channel ?: createFallbackChannel()
+    }
+
+  /**
+   * Creates a fallback channel of [.FALLBACK_CHANNEL_ID] ID, name fetched
+   * from Android resources ([.getFallbackChannelName]
+   * and importance set by [.FALLBACK_CHANNEL_IMPORTANCE].
+   *
+   * @return Newly created channel.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  protected fun createFallbackChannel(): NotificationChannel {
+    val channel = NotificationChannel(
+      FALLBACK_CHANNEL_ID,
+      fallbackChannelName,
+      FALLBACK_CHANNEL_IMPORTANCE
+    )
+    channel.setShowBadge(true)
+    channel.enableVibration(true)
+    notificationManager.createNotificationChannel(channel)
+    return channel
+  }
+
+  private val fallbackChannelName: String
+    /**
+     * Fetches fallback channel name from Android resources. Overridable by Android resources system
+     *
+     * @return Name of the fallback channel
+     */
+    get() = context.getString(R.string.expo_notifications_fallback_channel_name)
+
+  private val notificationManager: NotificationManager
+    get() = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+  companion object {
+    private const val FALLBACK_CHANNEL_ID = "expo_notifications_fallback_notification_channel"
+
+    // Behaviors we will want to impose on received notifications include
+    // being displayed as a heads-up notification. For that we will need
+    // a channel of high importance.
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    private val FALLBACK_CHANNEL_IMPORTANCE = NotificationManager.IMPORTANCE_HIGH
+  }
+
+  protected val notificationContent: INotificationContent
+    get() = notification.notificationRequest.content
+}

package/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ExpoNotificationBuilder.kt

@@ -10,21 +10,86 @@ import android.os.Parcel
 import android.provider.Settings
 import android.util.Log
 import androidx.core.app.NotificationCompat
+import androidx.core.app.RemoteInput
 import expo.modules.notifications.notifications.SoundResolver
 import expo.modules.notifications.notifications.enums.NotificationPriority
 import expo.modules.notifications.notifications.model.NotificationAction
+import expo.modules.notifications.notifications.model.NotificationCategory
 import expo.modules.notifications.notifications.model.NotificationRequest
 import expo.modules.notifications.notifications.model.NotificationResponse
+import expo.modules.notifications.notifications.model.TextInputNotificationAction
+import expo.modules.notifications.service.NotificationsService
 import expo.modules.notifications.service.NotificationsService.Companion.createNotificationResponseIntent
+import expo.modules.notifications.service.delegates.SharedPreferencesNotificationCategoriesStore
+import java.io.IOException
 import kotlin.math.max
 import kotlin.math.min
 
 /**
  * [NotificationBuilder] interpreting a JSON request object.
  */
-open class ExpoNotificationBuilder(context: Context?) : ChannelAwareNotificationBuilder(context) {
+open class ExpoNotificationBuilder(
+  context: Context,
+  notification: expo.modules.notifications.notifications.model.Notification,
+  private val store: SharedPreferencesNotificationCategoriesStore
+) : BaseNotificationBuilder(context, notification) {
+
+  open fun addActionsToBuilder(
+    builder: NotificationCompat.Builder,
+    categoryIdentifier: String
+  ) {
+    var actions = emptyList<NotificationAction>()
+    try {
+      val category: NotificationCategory? = store.getNotificationCategory(categoryIdentifier)
+      if (category != null) {
+        actions = category.actions
+      }
+    } catch (e: ClassNotFoundException) {
+      Log.e(
+        "expo-notifications",
+        String.format(
+          "Could not read category with identifier: %s. %s",
+          categoryIdentifier,
+          e.message
+        )
+      )
+    } catch (e: IOException) {
+      Log.e(
+        "expo-notifications",
+        String.format(
+          "Could not read category with identifier: %s. %s",
+          categoryIdentifier,
+          e.message
+        )
+      )
+    }
+    for (action in actions) {
+      if (action is TextInputNotificationAction) {
+        builder.addAction(buildTextInputAction(action))
+      } else {
+        builder.addAction(buildButtonAction(action))
+      }
+    }
+  }
+
+  protected fun buildButtonAction(action: NotificationAction): NotificationCompat.Action {
+    val intent = createNotificationResponseIntent(context, notification, action)
+    return NotificationCompat.Action.Builder(icon, action.title, intent).build()
+  }
+
+  protected fun buildTextInputAction(action: TextInputNotificationAction): NotificationCompat.Action {
+    val intent = createNotificationResponseIntent(context, notification, action)
+    val remoteInput = RemoteInput.Builder(NotificationsService.USER_TEXT_RESPONSE_KEY)
+      .setLabel(action.placeholder)
+      .build()
+
+    return NotificationCompat.Action.Builder(icon, action.title, intent)
+      .addRemoteInput(remoteInput).build()
+  }
+
   override suspend fun build(): Notification {
-    val builder = super.createBuilder()
+    val builder = createBuilder()
+
     builder.setSmallIcon(icon)
     builder.setPriority(priority)
 
@@ -33,14 +98,17 @@ open class ExpoNotificationBuilder(context: Context?) : ChannelAwareNotification
     builder.setAutoCancel(content.isAutoDismiss)
     builder.setOngoing(content.isSticky)
 
+    // see "Notification anatomy" https://developer.android.com/develop/ui/views/notifications#Templates
     builder.setContentTitle(content.title)
     builder.setContentText(content.text)
-    builder.setSubText(content.subtitle)
+    builder.setSubText(content.subText)
     // Sets the text/contentText as the bigText to allow the notification to be expanded and the
     // entire text to be viewed.
     builder.setStyle(NotificationCompat.BigTextStyle().bigText(content.text))
 
     color?.let { builder.color = it.toInt() }
+    notificationContent.badgeCount?.toInt()?.let { builder.setNumber(it) }
+    notificationContent.categoryId?.let { addActionsToBuilder(builder, it) }
 
     val shouldPlayDefaultSound = shouldPlaySound() && content.shouldPlayDefaultSound
     if (shouldPlayDefaultSound && shouldVibrate()) {
@@ -147,10 +215,9 @@ open class ExpoNotificationBuilder(context: Context?) : ChannelAwareNotification
    * @return Whether the notification should play a sound.
    */
   private fun shouldPlaySound(): Boolean {
-    val behaviorAllowsSound =
-      notificationBehavior == null || notificationBehavior.shouldPlaySound()
-
-    val contentAllowsSound = notificationContent.shouldPlayDefaultSound || notificationContent.soundName != null
+    val behaviorAllowsSound = notificationBehavior?.shouldPlaySound() ?: true
+    val contentAllowsSound =
+      notificationContent.shouldPlayDefaultSound || notificationContent.soundName != null
 
     return behaviorAllowsSound && contentAllowsSound
   }
@@ -166,8 +233,7 @@ open class ExpoNotificationBuilder(context: Context?) : ChannelAwareNotification
    * @return Whether the notification should vibrate.
    */
   private fun shouldVibrate(): Boolean {
-    val behaviorAllowsVibration =
-      notificationBehavior == null || notificationBehavior.shouldPlaySound()
+    val behaviorAllowsVibration = notificationBehavior?.shouldPlaySound() ?: true
 
     val contentAllowsVibration =
       notificationContent.shouldUseDefaultVibrationPattern || notificationContent.vibrationPattern != null
@@ -194,6 +260,7 @@ open class ExpoNotificationBuilder(context: Context?) : ChannelAwareNotification
     get() {
       val requestPriority = notificationContent.priority
 
+      val notificationBehavior = notificationBehavior
       // If we know of a behavior guideline, let's honor it...
       if (notificationBehavior != null) {
         // ...by using the priority override...
@@ -258,7 +325,7 @@ open class ExpoNotificationBuilder(context: Context?) : ChannelAwareNotification
       return null
     }
 
-  protected val icon: Int
+  protected open val icon: Int
     /**
      * The method first tries to get the icon from the manifest's meta-data [.META_DATA_DEFAULT_ICON_KEY].
      * If a custom setting is not found, the method falls back to using app icon.
@@ -280,7 +347,7 @@ open class ExpoNotificationBuilder(context: Context?) : ChannelAwareNotification
       return context.applicationInfo.icon
     }
 
-  protected val color: Number?
+  protected open val color: Number?
     /**
      * The method responsible for finding and returning a custom color used to color the notification icon.
      * It first tries to use a custom color defined in notification content, then it tries to fetch color
@@ -290,27 +357,29 @@ open class ExpoNotificationBuilder(context: Context?) : ChannelAwareNotification
      * or null if the default should be used.
      */
     get() {
-      if (notificationContent.color != null) {
-        return notificationContent.color
-      }
-
-      try {
-        val ai = context.packageManager.getApplicationInfo(
-          context.packageName,
-          PackageManager.GET_META_DATA
-        )
-        if (ai.metaData.containsKey(META_DATA_DEFAULT_COLOR_KEY)) {
-          return context.resources.getColor(
-            ai.metaData.getInt(META_DATA_DEFAULT_COLOR_KEY),
-            null
+      return notificationContent.color ?: run {
+        try {
+          val ai = context.packageManager.getApplicationInfo(
+            context.packageName,
+            PackageManager.GET_META_DATA
+          )
+          if (ai.metaData.containsKey(META_DATA_DEFAULT_COLOR_KEY)) {
+            return context.resources.getColor(
+              ai.metaData.getInt(META_DATA_DEFAULT_COLOR_KEY),
+              null
+            )
+          }
+        } catch (e: Exception) {
+          Log.e(
+            "expo-notifications",
+            "Could not have fetched default notification color.",
+            e
           )
         }
-      } catch (e: Exception) {
-        Log.e("expo-notifications", "Could not have fetched default notification color.", e)
-      }
 
-      // No custom color
-      return null
+        // No custom color
+        return null
+      }
     }
 
   companion object {

package/android/src/main/java/expo/modules/notifications/notifications/scheduling/NotificationScheduler.kt

@@ -21,6 +21,7 @@ import expo.modules.notifications.notifications.model.NotificationRequest
 import expo.modules.notifications.notifications.triggers.ChannelAwareTrigger
 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
@@ -197,6 +198,23 @@ open class NotificationScheduler : Module() {
         )
       }
 
+      "monthly" -> {
+        val day = params["day"] as? Number
+        val hour = params["hour"] as? Number
+        val minute = params["minute"] as? Number
+
+        if (day == null || hour == null || minute == null) {
+          throw InvalidArgumentException("Invalid value(s) provided for yearly trigger.")
+        }
+
+        MonthlyTrigger(
+          day.toInt(),
+          hour.toInt(),
+          minute.toInt(),
+          channelId
+        )
+      }
+
       "yearly" -> {
         val day = params["day"] as? Number
         val month = params["month"] as? Number