From 5b079c1b04e4325416424cd18d543c0bc53966d9 Mon Sep 17 00:00:00 2001 From: Douglas Nassif Roma Junior Date: Mon, 21 Aug 2017 13:38:06 -0300 Subject: [PATCH] Allow local notification without sound for Android. #441 --- .../react/fcm/FIRLocalMessagingHelper.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java b/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java index eca899a..fe7027c 100644 --- a/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java +++ b/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java @@ -82,7 +82,6 @@ public class FIRLocalMessagingHelper { .setSubText(bundle.getString("sub_text")) .setGroup(bundle.getString("group")) .setVibrate(new long[]{0, DEFAULT_VIBRATION}) - .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)) .setExtras(bundle.getBundle("data")); //priority @@ -151,14 +150,18 @@ public class FIRLocalMessagingHelper { } //sound - String soundName = bundle.getString("sound", "default"); - if (!soundName.equalsIgnoreCase("default")) { - int soundResourceId = res.getIdentifier(soundName, "raw", packageName); - if(soundResourceId == 0){ - soundName = soundName.substring(0, soundName.lastIndexOf('.')); - soundResourceId = res.getIdentifier(soundName, "raw", packageName); + String soundName = bundle.getString("sound"); + if (soundName != null) { + if (soundName.equalsIgnoreCase("default")) { + notification.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)); + } else { + int soundResourceId = res.getIdentifier(soundName, "raw", packageName); + if (soundResourceId == 0) { + soundName = soundName.substring(0, soundName.lastIndexOf('.')); + soundResourceId = res.getIdentifier(soundName, "raw", packageName); + } + notification.setSound(Uri.parse("android.resource://" + packageName + "/" + soundResourceId)); } - notification.setSound(Uri.parse("android.resource://" + packageName + "/" + soundResourceId)); } //color -- 2.26.2