Merge pull request #25 from Iterable/feature/ITBL-3821-OS-notification-payload

Feature/itbl 3821 os notification payload

Author: davidtruong

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

@@ -243,4 +243,18 @@ static boolean isGhostPush(Bundle extras) {
 
         return isGhostPush;
     }
+
+    /**
+     * Returns if the given notification has an empty body
+     * @param extras
+     * @return
+     */
+    static boolean isEmptyBody(Bundle extras) {
+        String notificationBody = "";
+        if (extras.containsKey(IterableConstants.ITERABLE_DATA_KEY)) {
+            notificationBody = extras.getString(IterableConstants.ITERABLE_DATA_BODY, "");
+        }
+
+        return notificationBody.isEmpty();
+    }
 }

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

@@ -46,22 +46,26 @@ private void handlePushReceived(Context context, Intent intent) {
         if (intent.hasExtra(IterableConstants.ITERABLE_DATA_KEY)) {
             Bundle extras =  intent.getExtras();
             if (!IterableNotification.isGhostPush(extras)) {
-                IterableLogger.d(TAG, "Iterable push received " + extras);
-                Context appContext = context.getApplicationContext();
-                PackageManager packageManager = appContext.getPackageManager();
-                Intent packageIntent = packageManager.getLaunchIntentForPackage(appContext.getPackageName());
-                ComponentName componentPackageName = packageIntent.getComponent();
-                String mainClassName = componentPackageName.getClassName();
-                Class mainClass = null;
-                try {
-                    mainClass = Class.forName(mainClassName);
-                } catch (ClassNotFoundException e) {
-                    IterableLogger.w(TAG, e.toString());
-                }
+                if (!IterableNotification.isEmptyBody(extras)) {
+                    IterableLogger.d(TAG, "Iterable push received " + extras);
+                    Context appContext = context.getApplicationContext();
+                    PackageManager packageManager = appContext.getPackageManager();
+                    Intent packageIntent = packageManager.getLaunchIntentForPackage(appContext.getPackageName());
+                    ComponentName componentPackageName = packageIntent.getComponent();
+                    String mainClassName = componentPackageName.getClassName();
+                    Class mainClass = null;
+                    try {
+                        mainClass = Class.forName(mainClassName);
+                    } catch (ClassNotFoundException e) {
+                        IterableLogger.w(TAG, e.toString());
+                    }
 
-                IterableNotification notificationBuilder = IterableNotification.createNotification(
-                        appContext, intent.getExtras(), mainClass);
-                new IterableNotificationBuilder().execute(notificationBuilder);
+                    IterableNotification notificationBuilder = IterableNotification.createNotification(
+                            appContext, intent.getExtras(), mainClass);
+                    new IterableNotificationBuilder().execute(notificationBuilder);
+                } else {
+                    IterableLogger.d(TAG, "Iterable OS notification push received");
+                }
             } else {
                 IterableLogger.d(TAG, "Iterable ghost silent push received");
             }