[expo-notifications] Fix test suite (#8413)

expo · May 22, 2020 · 5c1a1b2 · 5c1a1b2
1 parent 41580b3
commit 5c1a1b2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/apps/test-suite/tests/NewNotifications.js b/apps/test-suite/tests/NewNotifications.js
@@ -358,7 +358,7 @@ export async function test(t) {
               lightColor: '#FF231F7C',
               lockscreenVisibility: Notifications.AndroidNotificationVisibility.SECRET,
               showBadge: false,
-              soundUri: null,
+              sound: null,
               audioAttributes: {
                 usage: Notifications.AndroidAudioUsage.NOTIFICATION_COMMUNICATION_INSTANT,
                 contentType: Notifications.AndroidAudioContentType.SONIFICATION,

diff --git a/...java/expo/modules/notifications/notifications/channels/NotificationChannelSerializer.java b/...java/expo/modules/notifications/notifications/channels/NotificationChannelSerializer.java
@@ -76,7 +76,11 @@ public static String toString(@Nullable Uri uri) {
     return "custom";
   }
 
-  public static Bundle toBundle(AudioAttributes attributes) {
+  public static Bundle toBundle(@Nullable AudioAttributes attributes) {
+    if (attributes == null) {
+      return null;
+    }
+
     Bundle result = new Bundle();
     result.putInt(AUDIO_ATTRIBUTES_USAGE_KEY, AudioUsage.fromNativeValue(attributes.getUsage()).getEnumValue());
     result.putInt(AUDIO_ATTRIBUTES_CONTENT_TYPE_KEY, AudioContentType.fromNativeValue(attributes.getContentType()).getEnumValue());

diff --git a/...va/expo/modules/notifications/notifications/service/ExpoNotificationSchedulerService.java b/...va/expo/modules/notifications/notifications/service/ExpoNotificationSchedulerService.java
@@ -264,7 +264,7 @@ protected Collection<NotificationRequest> fetchNotifications() {
   protected NotificationRequest fetchNotification(String identifier) {
     try {
       return mStore.getNotificationRequest(identifier);
-    } catch (IOException | ClassNotFoundException e) {
+    } catch (IOException | ClassNotFoundException | NullPointerException e) {
       return null;
     }
   }