Code clean up for constants and validation for default value for push notification sound.

Author: davidtruong

iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java

@@ -55,4 +55,7 @@ public final class IterableConstants {
     public static final String ICON_FOLDER_IDENTIFIER = "drawable";
     public static final String NOTIFICATION_ICON_NAME = "iterable_notification_icon";
     public static final String NOTIFICATION_COLOR = "iterable_notification_color";
+    public static final String DEFAULT_SOUND = "default";
+    public static final String SOUND_FOLDER_IDENTIFIER = "raw";
+    public static final String ANDROID_RESOURCE_PATH = "android.resource://";
 }

iterableapi/src/main/java/com/iterable/iterableapi/IterableNotification.java

@@ -9,7 +9,6 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Vibrator;
 import android.support.v4.app.NotificationCompat;
 
 import java.util.Date;
@@ -71,9 +70,14 @@ public static IterableNotification createNotification(Context context, Bundle ex
             String[] soundFile = soundName.split("\\.");
             soundName = soundFile[0];
 
-            int soundID = context.getResources().getIdentifier(soundName, "raw", context.getPackageName());
-            Uri soundUri = Uri.parse("android.resource://" + context.getPackageName() + "/" + soundID);
-            notificationBuilder.setSound(soundUri);
+            if (soundName.equalsIgnoreCase(IterableConstants.DEFAULT_SOUND)){
+                int soundID = context.getResources().getIdentifier(soundName, IterableConstants.SOUND_FOLDER_IDENTIFIER, context.getPackageName());
+                Uri soundUri = Uri.parse(IterableConstants.ANDROID_RESOURCE_PATH + context.getPackageName() + "/" + soundID);
+                notificationBuilder.setSound(soundUri);
+            } else {
+                notifPermissions.defaults |= Notification.DEFAULT_SOUND;
+            }
+
         } else {
             notifPermissions.defaults |= Notification.DEFAULT_SOUND;
         }