E2-1736: Message archive handles all kinds of text (#288)

* add test for dict

* add test

* add all unit tests

Author: e7mac

AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java

@@ -23,6 +23,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.drm.DrmStore;
 import android.location.Location;
 import android.os.AsyncTask;
 import android.support.annotation.VisibleForTesting;
@@ -1337,24 +1338,46 @@ public static void triggerMessageDisplayed(ActionContext actionContext) {
     ActionManager.getInstance().recordMessageImpression(actionContext.getMessageId());
     synchronized (messageDisplayedHandlers) {
       for (MessageDisplayedCallback callback : messageDisplayedHandlers) {
-        String messageID = actionContext.getMessageId();
-        String messageBody = "";
-        try {
-          messageBody = (String) actionContext.getArgs().get("Message");
-        } catch (Throwable t) {
-          Util.handleException(t);
-        }
-        String recipientUserID = Leanplum.getUserId();
-        Date deliveryDateTime = new Date();
-
-        MessageArchiveData messageArchiveData = new MessageArchiveData(messageID,
-                messageBody, recipientUserID, deliveryDateTime);
+        MessageArchiveData messageArchiveData = messageArchiveDataFromContext(actionContext);
         callback.setMessageArchiveData(messageArchiveData);
         OsHandler.getInstance().post(callback);
       }
     }
   }
 
+  private static MessageArchiveData messageArchiveDataFromContext(ActionContext actionContext) {
+    String messageID = actionContext.getMessageId();
+    String messageBody = "";
+    try {
+      messageBody = messageBodyFromContext(actionContext);
+    } catch (Throwable t) {
+      Util.handleException(t);
+    }
+    String recipientUserID = Leanplum.getUserId();
+    Date deliveryDateTime = new Date();
+
+    return new MessageArchiveData(messageID, messageBody, recipientUserID, deliveryDateTime);
+  }
+
+  @VisibleForTesting
+  public static String messageBodyFromContext(ActionContext actionContext) {
+    Object messageObject =  actionContext.getArgs().get("Message");
+    if (messageObject instanceof String) {
+      return (String) messageObject;
+    } else {
+      HashMap<String, String> messageDict = (HashMap<String, String>) messageObject;
+      if (messageDict.get("Text") != null &&
+              messageDict.get("Text") instanceof String) {
+        return messageDict.get("Text");
+      }
+      if (messageDict.get("Text value") != null &&
+              messageDict.get("Text value") instanceof String) {
+        return messageDict.get("Text value");
+      }
+    }
+    return null;
+  }
+
   /**
    * Add a callback to call ONCE when no more file downloads are pending (either when no files
    * needed to be downloaded or all downloads have been completed).