fix sound for android

f4a24b47 · Libin Lu · 4dbcb8ca · 4dbcb8ca · f4a24b47
Commit f4a24b47 authored Jan 05, 2017 by Libin Lu
Showing with 7 additions and 162 deletions

android/react-native-fcm.iml android/react-native-fcm.iml +0 -160

android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java ...in/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java +7 -2

No files found.
--- a/android/react-native-fcm.iml
+++ b/android/react-native-fcm.iml
--- a/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java
@@ -134,8 +134,13 @@ public class FIRLocalMessagingHelper {
            }

            //sound
-            if (bundle.getString("sound") != null) {
-                int soundResourceId = res.getIdentifier(bundle.getString("sound"), "raw", packageName);
+            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);
+                }
                notification.setSound(Uri.parse("android.resource://" + packageName + "/" + soundResourceId));
            }