Setting sound to "null" or "nil" now disables it

Author: jkasten2

OneSignalSDK.jar

@@ -251,7 +251,7 @@ private static NotificationCompat.Builder getBaseNotificationCompatBuilder(JSONO
       if (bigPictureIcon != null)
          notifBuilder.setStyle(new NotificationCompat.BigPictureStyle().bigPicture(bigPictureIcon).setSummaryText(message));
 
-      if (OneSignal.getSoundEnabled(currentContext)) {
+      if (isSoundEnabled(gcmBundle)) {
          Uri soundUri = getCustomSound(gcmBundle);
          if (soundUri != null)
             notifBuilder.setSound(soundUri);
@@ -677,10 +677,17 @@ private static int getDrawableId(String name) {
       return contextResources.getIdentifier(name, "drawable", packageName);
    }
 
+   private static boolean isSoundEnabled(JSONObject gcmBundle) {
+      String sound = gcmBundle.optString("sound", null);
+      if ("null".equals(sound) || "nil".equals(sound))
+         return false;
+      return OneSignal.getSoundEnabled(currentContext);
+   }
+
    private static Uri getCustomSound(JSONObject gcmBundle) {
       int soundId;
       String sound = gcmBundle.optString("sound", null);
-
+      
       if (isValidResourceName(sound)) {
          soundId = contextResources.getIdentifier(sound, "raw", packageName);
          if (soundId != 0)

OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java

@@ -167,7 +167,7 @@ public void init() {
    private static TrackGooglePurchase trackGooglePurchase;
    private static TrackAmazonPurchase trackAmazonPurchase;
 
-   public static final String VERSION = "030101";
+   public static final String VERSION = "030200";
 
    private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();