Issue phonegap#207: Use default type_ringtone for android

sud80 · Jan 29, 2016 · e0c4697 · e0c4697
1 parent 2301364
commit e0c4697
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/docs/PAYLOAD.md b/docs/PAYLOAD.md
@@ -117,6 +117,8 @@ Produces the following notification.
 
 ## Sound
 
+For Android there are two special values for sound you can use. The first is `default` which will play the phones default notification sound. Then second is `ringtone` which will play the phones default ringtone sound.
+
 In order for your your notification to play a custom sound you will need to add the files to your Android project's `res/raw` directory. Then send the follow JSON from GCM:
 
 ```javascript

diff --git a/src/android/com/adobe/phonegap/push/GCMIntentService.java b/src/android/com/adobe/phonegap/push/GCMIntentService.java
@@ -453,7 +453,9 @@ private void setNotificationSound(Context context, Bundle extras, NotificationCo
         if (soundname == null) {
             soundname = extras.getString(SOUND);
         }
-        if (soundname != null && !soundname.contentEquals(SOUND_DEFAULT)) {
+        if (SOUND_RINGTONE.equals(soundname)) {
+            mBuilder.setSound(android.provider.Settings.System.DEFAULT_RINGTONE_URI);
+        } else if (soundname != null && !soundname.contentEquals(SOUND_DEFAULT)) {
             Uri sound = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE
                     + "://" + context.getPackageName() + "/raw/" + soundname);
             Log.d(LOG_TAG, sound.toString());

diff --git a/src/android/com/adobe/phonegap/push/PushConstants.java b/src/android/com/adobe/phonegap/push/PushConstants.java
@@ -11,6 +11,7 @@ public interface PushConstants {
     public static final String ICON_COLOR = "iconColor";
     public static final String SOUND = "sound";
     public static final String SOUND_DEFAULT = "default";
+    public static final String SOUND_RINGTONE = "ringtone";
     public static final String VIBRATE = "vibrate";
     public static final String ACTIONS = "actions";
     public static final String CALLBACK = "callback";