Merge pull request #5 from Iterable/development

Development

Author: davidtruong

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

@@ -49,9 +49,13 @@ public final class IterableConstants {
     public static final String ITERABLE_DATA_KEY = "itbl";
     public static final String ITERABLE_DATA_BODY = "body";
     public static final String ITERABLE_DATA_TITLE = "title";
+    public static final String ITERABLE_DATA_SOUND = "sound";
 
     public static final String INSTANCE_ID_CLASS = "com.google.android.gms.iid.InstanceID";
     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

@@ -7,6 +7,7 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
 
@@ -35,9 +36,12 @@ public static IterableNotification createNotification(Context context, Bundle ex
         int stringId = context.getApplicationInfo().labelRes;
         String applicationName  = context.getString(stringId);
         String notificationBody = null;
+        String soundName = null;
+
         if (extras.containsKey(IterableConstants.ITERABLE_DATA_KEY)) {
             notificationBody = extras.getString(IterableConstants.ITERABLE_DATA_BODY, notificationBody);
             applicationName = extras.getString(IterableConstants.ITERABLE_DATA_TITLE, applicationName);
+            soundName = extras.getString(IterableConstants.ITERABLE_DATA_SOUND, soundName);
         }
 
         Intent mainIntentWithExtras = new Intent(IterableConstants.ACTION_NOTIF_OPENED);
@@ -48,22 +52,39 @@ public static IterableNotification createNotification(Context context, Bundle ex
         PendingIntent notificationClickedIntent = PendingIntent.getActivity(context, 0,
                 mainIntentWithExtras, PendingIntent.FLAG_UPDATE_CURRENT);
 
-        IterableNotification notificationBuilder = new IterableNotification(
-                context);
-                notificationBuilder
-                .setDefaults(Notification.DEFAULT_SOUND)
-                .setSmallIcon(getIconId(context))
-                .setTicker(applicationName).setWhen(0)
-                .setAutoCancel(true)
-                .setContentTitle(applicationName)
-                .setStyle(new NotificationCompat.BigTextStyle().bigText(notificationBody))
-                .setPriority(Notification.PRIORITY_HIGH)
-                .setContentText(notificationBody);
+        Notification notifPermissions = new Notification();
+        notifPermissions.defaults |= Notification.DEFAULT_LIGHTS;
+
+        IterableNotification notificationBuilder = new IterableNotification(context);
+        notificationBuilder
+            .setSmallIcon(getIconId(context))
+            .setTicker(applicationName).setWhen(0)
+            .setAutoCancel(true)
+            .setContentTitle(applicationName)
+            .setStyle(new NotificationCompat.BigTextStyle().bigText(notificationBody))
+            .setPriority(Notification.PRIORITY_HIGH)
+            .setContentText(notificationBody);
+
+        if (soundName != null) {
+            //Removes the file type from the name
+            String[] soundFile = soundName.split("\\.");
+            soundName = soundFile[0];
+
+            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;
+        }
 
         notificationBuilder.setContentIntent(notificationClickedIntent);
         notificationBuilder.isGhostPush = IterableHelper.isGhostPush(extras);
 
-
         try {
             ApplicationInfo info = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
             notificationBuilder.setColor(info.metaData.getInt(IterableConstants.NOTIFICATION_COLOR));
@@ -72,12 +93,13 @@ public static IterableNotification createNotification(Context context, Bundle ex
         }
 
         PackageManager pm = context.getPackageManager();
-        if (pm.checkPermission("android.permission.VIBRATE", context.getPackageName()) == PackageManager.PERMISSION_GRANTED) {
-            notificationBuilder.setDefaults(Notification.DEFAULT_ALL);
-        } else {
-            notificationBuilder.setVibrate(null);
+        if (pm.checkPermission(android.Manifest.permission.VIBRATE, context.getPackageName()) == PackageManager.PERMISSION_GRANTED) {
+            notifPermissions.defaults |= Notification.DEFAULT_VIBRATE;
         }
 
+
+        notificationBuilder.setDefaults(notifPermissions.defaults);
+
         return notificationBuilder;
     }