expo-notifications 0.29.9 → 0.29.10

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.29.10 — 2024-12-02
+
+### 🐛 Bug fixes
+
+- [android] fix notifications with custom sounds treated as silent ([#33311](https://github.com/expo/expo/pull/33311) by [@pennersr](https://github.com/pennersr))
+
 ## 0.29.9 — 2024-11-29
 
 ### 🐛 Bug fixes

package/android/build.gradle

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

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

@@ -22,6 +22,7 @@ import java.io.Serializable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import androidx.annotation.VisibleForTesting;
 import expo.modules.notifications.notifications.enums.NotificationPriority;
 import expo.modules.notifications.notifications.interfaces.INotificationContent;
 import kotlin.coroutines.Continuation;
@@ -320,6 +321,15 @@ public class NotificationContent implements Parcelable, Serializable, INotificat
       return this;
     }
 
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    Builder disableVibrations() {
+      // remote notifications can come without vibrations
+      // we use this method do emulate that in tests
+      content.mShouldUseDefaultVibrationPattern = false;
+      content.mVibrationPattern = null;
+      return this;
+    }
+
     public Builder setVibrationPattern(long[] vibrationPattern) {
       content.mShouldUseDefaultVibrationPattern = false;
       content.mVibrationPattern = vibrationPattern;

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.os.Build
 import android.os.Bundle
 import android.os.Parcel
 import android.provider.Settings
@@ -13,6 +14,7 @@ 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.interfaces.INotificationContent
 import expo.modules.notifications.notifications.model.NotificationAction
 import expo.modules.notifications.notifications.model.NotificationCategory
 import expo.modules.notifications.notifications.model.NotificationRequest
@@ -110,31 +112,7 @@ open class ExpoNotificationBuilder(
     notificationContent.badgeCount?.toInt()?.let { builder.setNumber(it) }
     notificationContent.categoryId?.let { addActionsToBuilder(builder, it) }
 
-    val shouldPlayDefaultSound = shouldPlaySound() && content.shouldPlayDefaultSound
-    if (shouldPlayDefaultSound && shouldVibrate()) {
-      builder.setDefaults(NotificationCompat.DEFAULT_ALL) // set sound, vibration and lights
-    } else if (shouldVibrate()) {
-      builder.setDefaults(NotificationCompat.DEFAULT_VIBRATE)
-    } else if (shouldPlayDefaultSound) {
-      builder.setDefaults(NotificationCompat.DEFAULT_SOUND)
-    } else {
-      // Notification will not vibrate or play sound, regardless of channel
-      builder.setSilent(true)
-    }
-
-    if (shouldPlaySound() && content.soundName != null) {
-      content.soundName?.let { soundName ->
-        val soundUri = SoundResolver(context).resolve(soundName)
-        builder.setSound(soundUri)
-      }
-    } else if (shouldPlayDefaultSound) {
-      builder.setSound(Settings.System.DEFAULT_NOTIFICATION_URI)
-    }
-
-    val vibrationPatternOverride = content.vibrationPattern
-    if (shouldVibrate() && vibrationPatternOverride != null) {
-      builder.setVibrate(vibrationPatternOverride)
-    }
+    applySoundsAndVibrations(content, builder)
 
     if (content.body != null) {
       // Add body - JSON data - to extras
@@ -178,6 +156,42 @@ open class ExpoNotificationBuilder(
     return builder.build()
   }
 
+  private fun applySoundsAndVibrations(content: INotificationContent, builder: NotificationCompat.Builder) {
+    val shouldPlaySound = shouldPlaySound()
+    val shouldVibrate = shouldVibrate()
+
+    if (!shouldPlaySound && !shouldVibrate) {
+      // Notification will not vibrate or play sound, regardless of channel
+      builder.setSilent(true)
+    }
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+      // the calls below are ignored on Android O and newer because the sound and vibration are set in the channel
+      val shouldPlayDefaultSound = shouldPlaySound && content.shouldPlayDefaultSound
+      val shouldUseDefaultVibrationPattern = shouldVibrate && content.shouldUseDefaultVibrationPattern
+      if (shouldUseDefaultVibrationPattern && shouldPlayDefaultSound) {
+        builder.setDefaults(NotificationCompat.DEFAULT_ALL)
+      } else {
+        if (shouldPlaySound) {
+          if (content.soundName != null) {
+            val soundUri = SoundResolver(context).resolve(content.soundName)
+            builder.setSound(soundUri)
+          } else if (shouldPlayDefaultSound) {
+            builder.setDefaults(NotificationCompat.DEFAULT_SOUND)
+            builder.setSound(Settings.System.DEFAULT_NOTIFICATION_URI)
+          }
+        }
+        if (shouldVibrate) {
+          val vibrationPatternOverride = content.vibrationPattern
+          if (vibrationPatternOverride != null) {
+            builder.setVibrate(vibrationPatternOverride)
+          } else if (shouldUseDefaultVibrationPattern) {
+            builder.setDefaults(NotificationCompat.DEFAULT_VIBRATE)
+          }
+        }
+      }
+    }
+  }
+
   /**
    * Marshalls [NotificationRequest] into to a byte array.
    *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-notifications",
-  "version": "0.29.9",
+  "version": "0.29.10",
   "description": "Provides an API to fetch push notification tokens and to present, schedule, receive, and respond to notifications.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -55,5 +55,5 @@
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "728158f99d680cf64fb06f08301d3806c18c6f63"
+  "gitHead": "bc1fea6bcab47889e2922d543920397691b200f3"
 }