Merge pull request #20 from Iterable/bugfix/ITBL-3312-android-image-notif

Updates attachment url location to pull from inside of the itbl payload.

Author: davidtruong

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

@@ -56,7 +56,7 @@ public final class IterableConstants {
     public static final String IS_GHOST_PUSH        = "isGhostPush";
     public static final String ITERABLE_DATA_BODY   = "body";
     public static final String ITERABLE_DATA_KEY    = "itbl";
-    public static final String ITERABLE_DATA_PUSH_IMAGE  = "attachment_url";
+    public static final String ITERABLE_DATA_PUSH_IMAGE  = "attachment-url";
     public static final String ITERABLE_DATA_SOUND  = "sound";
     public static final String ITERABLE_DATA_TITLE  = "title";
 

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

@@ -16,6 +16,9 @@
 
 import com.squareup.picasso.Picasso;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  *
  * Created by David Truong dt@iterable.com
@@ -83,11 +86,19 @@ public static IterableNotification createNotification(Context context, Bundle ex
             applicationName = extras.getString(IterableConstants.ITERABLE_DATA_TITLE, applicationName);
             notificationBody = extras.getString(IterableConstants.ITERABLE_DATA_BODY);
             soundName = extras.getString(IterableConstants.ITERABLE_DATA_SOUND);
-            pushImage = extras.getString(IterableConstants.ITERABLE_DATA_PUSH_IMAGE);
 
             String iterableData = extras.getString(IterableConstants.ITERABLE_DATA_KEY);
             notificationBuilder.iterableNotificationData = new IterableNotificationData(iterableData);
             messageId = notificationBuilder.iterableNotificationData.getMessageId();
+
+            try {
+                JSONObject iterableJson = new JSONObject(iterableData);
+                if (iterableJson.has(IterableConstants.ITERABLE_DATA_PUSH_IMAGE)) {
+                    pushImage = iterableJson.getString(IterableConstants.ITERABLE_DATA_PUSH_IMAGE);
+                }
+            } catch (JSONException e) {
+                IterableLogger.w(TAG, e.toString());
+            }
         }
 
         Intent mainIntentWithExtras = new Intent(IterableConstants.ACTION_NOTIF_OPENED);