Merge branch 'release/3.0.1'

# Conflicts:
#	AndroidSDK/src/com/leanplum/internal/Constants.java

Author: Enuviel

AndroidSDK/build.gradle

@@ -17,9 +17,9 @@ allprojects {
 dependencies {
     // Compile dependencies will be added as dependency in pom file.
     //noinspection GradleDynamicVersion
-    compile "com.android.support:support-v4:[14.0.0,${SUPPORT_LIBRARY_VERSION}]"
+    compile "com.android.support:support-v4:[22.0.0,${SUPPORT_LIBRARY_VERSION}]"
     //noinspection GradleDynamicVersion
-    compile "com.android.support:appcompat-v7:[14.0.0,${SUPPORT_LIBRARY_VERSION}]"
+    compile "com.android.support:appcompat-v7:[22.0.0,${SUPPORT_LIBRARY_VERSION}]"
 
     // Provided dependencies are optional dependencies and will not show up in pom file.
     provided('com.google.android.gms:play-services-gcm:[8.3.0,)') {

AndroidSDK/src/com/leanplum/ActionContext.java

@@ -374,8 +374,8 @@ public void runActionNamed(String name) {
   /**
    * Return true if here was an action for this message and we started it.
    */
-  private boolean createActionContextForMessageId(String messageAction, Map<String, Object>
-      messageArgs, String messageId, String name, Boolean chained) {
+  private boolean createActionContextForMessageId(String messageAction,
+      Map<String, Object> messageArgs, String messageId, String name, Boolean chained) {
     try {
       final ActionContext actionContext = new ActionContext(messageAction,
           messageArgs, messageId);
@@ -406,28 +406,69 @@ public void variablesChanged() {
   }
 
   /**
-   * Return true if here was action "Chain to Existing Message" and we started it.
+   * Return true if there was action "Chain to Existing Message" and we started it.
    */
-  private boolean isChainToExistingMessageStarted(Map<String, Object> args, String name) {
+  private boolean isChainToExistingMessageStarted(Map<String, Object> args, final String name) {
     if (args == null) {
       return false;
     }
 
-    String messageId = (String) args.get(Constants.Values.CHAIN_MESSAGE_ARG);
-    Object actionType = args.get(Constants.Values.ACTION_ARG);
-    if (messageId != null && Constants.Values.CHAIN_MESSAGE_ACTION_NAME.equals(actionType)) {
-      Map<String, Object> messages = VarCache.messages();
-      if (messages != null && messages.containsKey(messageId)) {
-        Map<String, Object> message = CollectionUtil.uncheckedCast(messages.get(messageId));
-        if (message != null) {
-          Map<String, Object> messageArgs = CollectionUtil.uncheckedCast(
-              message.get(Constants.Keys.VARS));
-          Object messageAction = message.get("action");
-          return messageAction != null && createActionContextForMessageId(messageAction.toString(),
-              messageArgs, messageId, name, true);
+    final String messageId = getChainedMessageId(args);
+    if (!shouldForceContentUpdateForChainedMessage(args)) {
+      return executeChainedMessage(messageId, VarCache.messages(), name);
+    } else {
+      // message may not on the device yet, so we need to fetch it.
+      Leanplum.forceContentUpdate(new VariablesChangedCallback() {
+        @Override
+        public void variablesChanged() {
+          executeChainedMessage(messageId, VarCache.messages(), name);
         }
+      });
+    }
+    return false;
+  }
+
+  /**
+   * Return true if there is a chained message in the actionMap that is not yet loaded onto the device.
+   */
+  static boolean shouldForceContentUpdateForChainedMessage(Map<String, Object> actionMap) {
+    if (actionMap == null) {
+      return false;
+    }
+    String chainedMessageId = getChainedMessageId(actionMap);
+    if (chainedMessageId != null
+            && (VarCache.messages() == null || !VarCache.messages().containsKey(chainedMessageId))) {
+        return true;
+    }
+    return false;
+  }
+
+  /**
+   * Extract chained messageId from parent message's actionMap.  If it doesn't exist then return null.
+   */
+  static String getChainedMessageId(Map<String, Object> actionMap) {
+    if (actionMap != null) {
+      if (Constants.Values.CHAIN_MESSAGE_ACTION_NAME.equals(actionMap.get(Constants.Values.ACTION_ARG))) {
+        return (String) actionMap.get(Constants.Values.CHAIN_MESSAGE_ARG);
       }
     }
+    return null;
+  }
+
+
+  private boolean executeChainedMessage(String messageId, Map<String, Object> messages,
+                                        String name) {
+    if (messages == null) {
+      return false;
+    }
+    Map<String, Object> message = CollectionUtil.uncheckedCast(messages.get(messageId));
+    if (message != null) {
+      Map<String, Object> messageArgs = CollectionUtil.uncheckedCast(
+              message.get(Constants.Keys.VARS));
+      Object messageAction = message.get("action");
+      return messageAction != null && createActionContextForMessageId(messageAction.toString(),
+              messageArgs, messageId, name, true);
+    }
     return false;
   }
 

AndroidSDK/src/com/leanplum/Leanplum.java

@@ -821,7 +821,7 @@ public void onResponse(boolean success) {
                   public void run() {
                     try {
                       NotificationCompat.Builder builder =
-                          LeanplumNotificationHelper.getDefaultNotificationBuilder(context,
+                          LeanplumNotificationHelper.getDefaultCompatNotificationBuilder(context,
                               BuildUtil.isNotificationChannelSupported(context));
                       if (builder == null) {
                         return;

AndroidSDK/src/com/leanplum/LeanplumInboxMessage.java

@@ -26,6 +26,7 @@
 
 import com.leanplum.internal.CollectionUtil;
 import com.leanplum.internal.Constants;
+import com.leanplum.internal.JsonConverter;
 import com.leanplum.internal.Log;
 import com.leanplum.internal.Request;
 import com.leanplum.internal.Util;
@@ -110,11 +111,10 @@ public Uri getImageUrl() {
   public JSONObject getData() {
     JSONObject object = null;
     try {
-      String dataString = getContext().stringNamed(Constants.Keys.DATA);
-      if (!TextUtils.isEmpty(dataString)) {
-        object = new JSONObject(dataString);
-      }
-    } catch (Exception e) {
+      Map<String, ?> mapData =
+          CollectionUtil.uncheckedCast(getContext().objectNamed(Constants.Keys.DATA));
+      object = JsonConverter.mapToJsonObject(mapData);
+    } catch (Throwable t) {
       Log.w("Unable to parse JSONObject for Data field of inbox message.");
     }
     return object;
@@ -127,7 +127,6 @@ public String getMessageId() {
     return messageId;
   }
 
-
   /**
    * Returns the title of the inbox message.
    */
@@ -293,5 +292,4 @@ private Map<String, Object> actionArgs() {
   private void setIsRead(boolean isRead) {
     this.isRead = isRead;
   }
-
 }

AndroidSDK/src/com/leanplum/LeanplumNotificationHelper.java

@@ -20,11 +20,19 @@
  */
 package com.leanplum;
 
+import android.app.Notification;
+import android.app.PendingIntent;
 import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
+import android.util.TypedValue;
+import android.widget.RemoteViews;
 
+import com.leanplum.internal.Constants;
 import com.leanplum.internal.JsonConverter;
 import com.leanplum.internal.Log;
 import com.leanplum.utils.BuildUtil;
@@ -37,6 +45,10 @@
  * @author Anna Orlova
  */
 class LeanplumNotificationHelper {
+
+  private static final int BIGPICTURE_TEXT_TOP_PADDING = -14;
+  private static final int BIGPICTURE_TEXT_SIZE = 14;
+
   /**
    * If notification channels are supported this method will try to create
    * NotificationCompat.Builder with default notification channel if default channel id is provided.
@@ -49,7 +61,7 @@ class LeanplumNotificationHelper {
    */
   // NotificationCompat.Builder(Context context) constructor was deprecated in API level 26.
   @SuppressWarnings("deprecation")
-  static NotificationCompat.Builder getDefaultNotificationBuilder(Context context,
+  static NotificationCompat.Builder getDefaultCompatNotificationBuilder(Context context,
       boolean isNotificationChannelSupported) {
     if (!isNotificationChannelSupported) {
       return new NotificationCompat.Builder(context);
@@ -63,6 +75,32 @@ static NotificationCompat.Builder getDefaultNotificationBuilder(Context context,
     }
   }
 
+  /**
+   * If notification channels are supported this method will try to create
+   * Notification.Builder with default notification channel if default channel id is provided.
+   * If notification channels not supported this method will return Notification.Builder for
+   * context.
+   *
+   * @param context The application context.
+   * @param isNotificationChannelSupported True if notification channels are supported.
+   * @return Notification.Builder for provided context or null.
+   */
+  // Notification.Builder(Context context) constructor was deprecated in API level 26.
+  @SuppressWarnings("deprecation")
+  private static Notification.Builder getDefaultNotificationBuilder(Context context,
+      boolean isNotificationChannelSupported) {
+    if (!isNotificationChannelSupported) {
+      return new Notification.Builder(context);
+    }
+    String channelId = LeanplumNotificationChannel.getDefaultNotificationChannelId(context);
+    if (!TextUtils.isEmpty(channelId)) {
+      return new Notification.Builder(context, channelId);
+    } else {
+      Log.w("Failed to post notification, there are no notification channels configured.");
+      return null;
+    }
+  }
+
   /**
    * If notification channels are supported this method will try to create a channel with
    * information from the message if it doesn't exist and return NotificationCompat.Builder for this
@@ -76,7 +114,7 @@ static NotificationCompat.Builder getDefaultNotificationBuilder(Context context,
    */
   // NotificationCompat.Builder(Context context) constructor was deprecated in API level 26.
   @SuppressWarnings("deprecation")
-  static NotificationCompat.Builder getNotificationBuilder(Context context, Bundle message) {
+  static NotificationCompat.Builder getNotificationCompatBuilder(Context context, Bundle message) {
     NotificationCompat.Builder builder = null;
     // If we are targeting API 26, try to find supplied channel to post notification.
     if (BuildUtil.isNotificationChannelSupported(context)) {
@@ -94,7 +132,7 @@ static NotificationCompat.Builder getNotificationBuilder(Context context, Bundle
           }
         } else {
           // If channel isn't supplied, try to look up for default channel.
-          builder = LeanplumNotificationHelper.getDefaultNotificationBuilder(context, true);
+          builder = LeanplumNotificationHelper.getDefaultCompatNotificationBuilder(context, true);
         }
       } catch (Exception e) {
         Log.e("Failed to post notification to specified channel.");
@@ -104,4 +142,111 @@ static NotificationCompat.Builder getNotificationBuilder(Context context, Bundle
     }
     return builder;
   }
+
+  /**
+   * If notification channels are supported this method will try to create a channel with
+   * information from the message if it doesn't exist and return Notification.Builder for this
+   * channel. In the case where no channel information inside the message, we will try to get a
+   * channel with default channel id. If notification channels not supported this method will return
+   * Notification.Builder for context.
+   *
+   * @param context The application context.
+   * @param message Push notification Bundle.
+   * @return Notification.Builder or null.
+   */
+  static Notification.Builder getNotificationBuilder(Context context, Bundle message) {
+    Notification.Builder builder = null;
+    // If we are targeting API 26, try to find supplied channel to post notification.
+    if (BuildUtil.isNotificationChannelSupported(context)) {
+      try {
+        String channel = message.getString("lp_channel");
+        if (!TextUtils.isEmpty(channel)) {
+          // Create channel if it doesn't exist and post notification to that channel.
+          Map<String, Object> channelDetails = JsonConverter.fromJson(channel);
+          String channelId = LeanplumNotificationChannel.createNotificationChannel(context,
+              channelDetails);
+          if (!TextUtils.isEmpty(channelId)) {
+            builder = new Notification.Builder(context, channelId);
+          } else {
+            Log.w("Failed to post notification to specified channel.");
+          }
+        } else {
+          // If channel isn't supplied, try to look up for default channel.
+          builder = LeanplumNotificationHelper.getDefaultNotificationBuilder(context, true);
+        }
+      } catch (Exception e) {
+        Log.e("Failed to post notification to specified channel.");
+      }
+    } else {
+      builder = new Notification.Builder(context);
+    }
+    return builder;
+  }
+
+  /**
+   * Gets Notification.Builder with 2 lines at BigPictureStyle notification text.
+   *
+   * @param context The application context.
+   * @param message Push notification Bundle.
+   * @param contentIntent PendingIntent.
+   * @param title String with title for push notification.
+   * @param messageText String with text for push notification.
+   * @param bigPicture Bitmap for BigPictureStyle notification.
+   * @return Notification.Builder or null.
+   */
+  static Notification.Builder getNotificationBuilder(Context context, Bundle message,
+      PendingIntent contentIntent, String title, final String messageText, Bitmap bigPicture) {
+    if (Build.VERSION.SDK_INT < 16) {
+      return null;
+    }
+    Notification.Builder notificationBuilder =
+        getNotificationBuilder(context, message);
+    notificationBuilder.setSmallIcon(context.getApplicationInfo().icon)
+        .setContentTitle(title)
+        .setContentText(messageText);
+    Notification.BigPictureStyle bigPictureStyle = new Notification.BigPictureStyle() {
+      @Override
+      protected RemoteViews getStandardView(int layoutId) {
+        RemoteViews remoteViews = super.getStandardView(layoutId);
+        // Modifications of stanxdard push RemoteView.
+        try {
+          int id = Resources.getSystem().getIdentifier("text", "id", "android");
+          remoteViews.setBoolean(id, "setSingleLine", false);
+          remoteViews.setInt(id, "setLines", 2);
+          if (Build.VERSION.SDK_INT < 23) {
+            // Make text smaller.
+            remoteViews.setViewPadding(id, 0, BIGPICTURE_TEXT_TOP_PADDING, 0, 0);
+            remoteViews.setTextViewTextSize(id, TypedValue.COMPLEX_UNIT_SP, BIGPICTURE_TEXT_SIZE);
+          }
+        } catch (Throwable throwable) {
+          Log.e("Cannot modify push notification layout.");
+        }
+        return remoteViews;
+      }
+    };
+
+    bigPictureStyle.bigPicture(bigPicture)
+        .setBigContentTitle(title)
+        .setSummaryText(message.getString(Constants.Keys.PUSH_MESSAGE_TEXT));
+    notificationBuilder.setStyle(bigPictureStyle);
+
+    if (Build.VERSION.SDK_INT >= 24) {
+      // By default we cannot reach getStandardView method on API>=24. I we call
+      // createBigContentView, Android will call getStandardView method and we can get
+      // modified RemoteView.
+      try {
+        RemoteViews remoteView = notificationBuilder.createBigContentView();
+        if (remoteView != null) {
+          // We need to set received RemoteView as a custom big content view.
+          notificationBuilder.setCustomBigContentView(remoteView);
+        }
+      } catch (Throwable t) {
+        Log.e("Cannot modify push notification layout.", t);
+      }
+    }
+
+    notificationBuilder.setAutoCancel(true);
+    notificationBuilder.setContentIntent(contentIntent);
+    return notificationBuilder;
+  }
 }