expo-notifications 1.0.0-canary-20240912-1059f85 → 1.0.0-canary-20240927-ab8a962

package/CHANGELOG.md

@@ -5,21 +5,41 @@
 ### 🛠 Breaking changes
 
 - 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))
+
 ### 🐛 Bug fixes
 
-- [Android] Take `channelId` into account when presenting notifications. ([#31201](https://github.com/expo/expo/pull/31201) 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))
-- [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))
-- [Android] Fix content.data in scheduled notifications surfaced to JS. ([#31048](https://github.com/expo/expo/pull/31048) by [@douglowder](https://github.com/douglowder))
-- [Android] fix local notifications with null trigger. ([#31157](https://github.com/expo/expo/pull/31157) by [@douglowder](https://github.com/douglowder))
 
 ### 💡 Others
 
+- 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))
 
+## 0.28.17 - 2024-09-17
+
+### 🐛 Bug fixes
+
+- [Android] image was missing on android when in foreground ([#31405](https://github.com/expo/expo/pull/31405) by [@vonovak](https://github.com/vonovak))
+- [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
+
+### 🐛 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
+
+### 🐛 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
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -15,6 +15,7 @@ android {
   defaultConfig {
     versionCode 21
     versionName '0.28.3'
+    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
 
   buildFeatures {
@@ -34,17 +35,19 @@ android {
 }
 
 dependencies {
-  api 'androidx.core:core:1.5.0'
-  api 'androidx.lifecycle:lifecycle-runtime:2.2.0'
-  api 'androidx.lifecycle:lifecycle-process:2.2.0'
-  api 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
+  implementation 'androidx.core:core:1.6.0'
+  implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0'
+  implementation 'androidx.lifecycle:lifecycle-process:2.2.0'
+  implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
+  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
+  // release notes in https://firebase.google.com/support/release-notes/android - cmd + f "Cloud Messaging version"
+  implementation 'com.google.firebase:firebase-messaging:24.0.1'
 
-  api 'com.google.firebase:firebase-messaging:22.0.0'
-
-  api 'me.leolin:ShortcutBadger:1.1.22@aar'
+  implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
 
   if (project.findProject(':expo-modules-test-core')) {
     testImplementation project(':expo-modules-test-core')
+    androidTestImplementation project(':expo-modules-test-core')
   }
 }

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

@@ -3,7 +3,6 @@ package expo.modules.notifications.notifications;
 import static expo.modules.notifications.UtilsKt.filteredBundleForJSTypeConverter;
 import static expo.modules.notifications.UtilsKt.isValidJSONString;
 
-import android.os.Build;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
@@ -22,10 +21,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import expo.modules.notifications.notifications.interfaces.INotificationContent;
 import expo.modules.notifications.notifications.interfaces.NotificationTrigger;
 import expo.modules.notifications.notifications.interfaces.SchedulableNotificationTrigger;
 import expo.modules.notifications.notifications.model.Notification;
-import expo.modules.notifications.notifications.model.NotificationContent;
 import expo.modules.notifications.notifications.model.NotificationRequest;
 import expo.modules.notifications.notifications.model.NotificationResponse;
 import expo.modules.notifications.notifications.model.TextInputNotificationResponse;
@@ -51,7 +50,7 @@ public class NotificationSerializer {
   public static Bundle toBundle(Notification notification) {
     Bundle serializedNotification = new Bundle();
     serializedNotification.putBundle("request", toBundle(notification.getNotificationRequest()));
-    serializedNotification.putLong("date", notification.getDate().getTime());
+    serializedNotification.putLong("date", notification.getOriginDate().getTime());
     return serializedNotification;
   }
 
@@ -99,7 +98,7 @@ public class NotificationSerializer {
     return result;
   }
 
-  public static Bundle toBundle(NotificationContent content) {
+  public static Bundle toBundle(INotificationContent content) {
     Bundle serializedContent = new Bundle();
     serializedContent.putString("title", content.getTitle());
     serializedContent.putString("subtitle", content.getSubtitle());
@@ -113,9 +112,9 @@ public class NotificationSerializer {
     } else {
       serializedContent.putString("badge", null);
     }
-    if (content.shouldPlayDefaultSound()) {
+    if (content.getShouldPlayDefaultSound()) {
       serializedContent.putString("sound", "default");
-    } else if (content.getSound() != null) {
+    } else if (content.getSoundName() != null) {
       serializedContent.putString("sound", "custom");
     } else {
       serializedContent.putString("sound", null);
@@ -228,10 +227,7 @@ public class NotificationSerializer {
 
   @Nullable
   private static String getChannelId(NotificationTrigger trigger) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      return trigger.getNotificationChannel();
-    }
-    return null;
+    return trigger.getNotificationChannel();
   }
 
   @NotNull

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

@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
 
 /**
  * A shared logic between ContentBuilders ({@link ArgumentsNotificationContentBuilder}
- * and {@link JSONNotificationContentBuilder}) for resolving sounds based on the "sound" property.
+ * and {@link RemoteNotificationContent}) for resolving sounds based on the "soundName" property.
  */
 public class SoundResolver {
   private Context mContext;

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

@@ -61,7 +61,6 @@ object DebugLogging {
     Log.i("expo-notifications", logMessage)
   }
 
-  @RequiresApi(Build.VERSION_CODES.O)
   fun logNotification(caller: String, notification: Notification) {
     if (!BuildConfig.DEBUG) {
       // Do not log for release/production builds
@@ -73,12 +72,11 @@ object DebugLogging {
         notification.notificationRequest.content.title: ${notification.notificationRequest.content.title}
         notification.notificationRequest.content.subtitle: ${notification.notificationRequest.content.subtitle}
         notification.notificationRequest.content.text: ${notification.notificationRequest.content.text}
-        notification.notificationRequest.content.sound: ${notification.notificationRequest.content.sound}
+        notification.notificationRequest.content.sound: ${notification.notificationRequest.content.soundName}
         notification.notificationRequest.content.channelID: ${notification.notificationRequest.trigger.notificationChannel}
         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()}
-        notification.notificationRequest.trigger.notificationChannel: ${notification.notificationRequest.trigger.notificationChannel}
+        notification.notificationRequest.content.vibrationPattern: ${notification.notificationRequest.content.vibrationPattern?.contentToString()}
         notification.notificationRequest.identifier: ${notification.notificationRequest.identifier}
       """.trimIndent()
 

package/android/src/main/java/expo/modules/notifications/notifications/emitting/NotificationsEmitter.kt

@@ -41,6 +41,11 @@ open class NotificationsEmitter : Module(), NotificationListener {
     AsyncFunction<Bundle?>("getLastNotificationResponseAsync") {
       lastNotificationResponseBundle
     }
+
+    AsyncFunction("clearLastNotificationResponseAsync") {
+      lastNotificationResponseBundle = null
+      null
+    }
   }
 
   /**

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

@@ -0,0 +1,38 @@
+package expo.modules.notifications.notifications.interfaces
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.os.Parcelable
+import expo.modules.notifications.notifications.enums.NotificationPriority
+import org.json.JSONObject
+
+/**
+ * This interface is implemented by classes representing notification content.
+ * I.e. local notifications [NotificationContent] and remote notifications [RemoteNotificationContent].
+ *
+ * The reason the two classes exist is that one is persisted locally in SharedPreferences, and the other is not.
+ * The first is therefore a bit "fragile" and harder to refactor, while the second is easier to change.
+ * This interface exists to provide a common API for both classes.
+ * */
+interface INotificationContent : Parcelable {
+  val title: String?
+  val text: String?
+  val subtitle: String?
+  val badgeCount: Number?
+  val shouldPlayDefaultSound: Boolean
+
+  // soundName is better off as a string (was an Uri) because in RemoteNotification we can obtain the sound name
+  // in local notification we store the uri and derive the sound name from it
+  val soundName: String?
+  val shouldUseDefaultVibrationPattern: Boolean
+  val vibrationPattern: LongArray?
+  val body: JSONObject?
+  val priority: NotificationPriority
+  val color: Number?
+  val isAutoDismiss: Boolean
+  val categoryId: String?
+  val isSticky: Boolean
+
+  fun containsImage(): Boolean
+  suspend fun getImage(context: Context): Bitmap?
+}

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

@@ -0,0 +1,34 @@
+package expo.modules.notifications.notifications.interfaces
+
+import expo.modules.notifications.notifications.model.Notification
+import expo.modules.notifications.notifications.model.NotificationBehavior
+
+/**
+ * An object capable of building a [Notification] based
+ * 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.
+   *
+   * @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?
+
+  /**
+   * Builds the Android notification based on passed in data.
+   *
+   * @return Built notification.
+   */
+  suspend fun build(): android.app.Notification
+}

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

@@ -1,10 +1,8 @@
 package expo.modules.notifications.notifications.interfaces;
 
-import android.os.Build;
 import android.os.Parcelable;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 
 /**
  * An interface specifying source of the notification, to be implemented
@@ -12,7 +10,6 @@ import androidx.annotation.RequiresApi;
  */
 public interface NotificationTrigger extends Parcelable {
   @Nullable
-  @RequiresApi(api = Build.VERSION_CODES.O)
   default String getNotificationChannel() {
     return null;
   }

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

@@ -6,11 +6,11 @@ import android.os.Parcelable;
 import java.util.Date;
 
 /**
- * A class representing a single notification received at a particular moment ({@link #mDate}).
+ * A class representing a single notification. Origin date ({@link #mOriginDate}) is time when it was sent (remote) or when it was posted (local).
  */
 public class Notification implements Parcelable {
   private NotificationRequest mRequest;
-  private Date mDate;
+  private Date mOriginDate;
 
   public Notification(NotificationRequest request) {
     this(request, new Date());
@@ -18,16 +18,16 @@ public class Notification implements Parcelable {
 
   public Notification(NotificationRequest request, Date date) {
     mRequest = request;
-    mDate = date;
+    mOriginDate = date;
   }
 
   protected Notification(Parcel in) {
     mRequest = in.readParcelable(getClass().getClassLoader());
-    mDate = new Date(in.readLong());
+    mOriginDate = new Date(in.readLong());
   }
 
-  public Date getDate() {
-    return mDate;
+  public Date getOriginDate() {
+    return mOriginDate;
   }
 
   public NotificationRequest getNotificationRequest() {
@@ -54,6 +54,6 @@ public class Notification implements Parcelable {
   @Override
   public void writeToParcel(Parcel dest, int flags) {
     dest.writeParcelable(mRequest, 0);
-    dest.writeLong(mDate.getTime());
+    dest.writeLong(mOriginDate.getTime());
   }
 }