Commit 0d06b5fe authored by Simon MacDonald's avatar Simon MacDonald
Browse files

Merge pull request #322 from LightZam/android-sound 

add sound default statement
parents d6b3e1f9 5595cce6

src/android/com/adobe/phonegap/push/GCMIntentService.java

+1 −1
Changes for src/android/com/adobe/phonegap/push/GCMIntentService.java: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -453,7 +453,7 @@ public class GCMIntentService extends GcmListenerService implements PushConstant 
        if (soundname == null) {

        if (soundname == null) {

            soundname = extras.getString(SOUND);

            soundname = extras.getString(SOUND);

        }

        }

        if (soundname != null) {

        if (soundname != null && !soundname.contentEquals(SOUND_DEFAULT)) {

            Uri sound = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE

            Uri sound = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE

                    + "://" + context.getPackageName() + "/raw/" + soundname);

                    + "://" + context.getPackageName() + "/raw/" + soundname);

            Log.d(LOG_TAG, sound.toString());

            Log.d(LOG_TAG, sound.toString());

src/android/com/adobe/phonegap/push/PushConstants.java

+1 −0
Changes for src/android/com/adobe/phonegap/push/PushConstants.java: 1 added line, 0 removed lines.
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ public interface PushConstants { 
    public static final String ICON = "icon";

    public static final String ICON = "icon";

    public static final String ICON_COLOR = "iconColor";

    public static final String ICON_COLOR = "iconColor";

    public static final String SOUND = "sound";

    public static final String SOUND = "sound";

    public static final String SOUND_DEFAULT = "default";

    public static final String VIBRATE = "vibrate";

    public static final String VIBRATE = "vibrate";

    public static final String ACTIONS = "actions";

    public static final String ACTIONS = "actions";

    public static final String CALLBACK = "callback";

    public static final String CALLBACK = "callback";