Add new features to IAM preview

   * Add prompt to IAM preview
   * Add logs for tags and outcomes
   * Redisplay, tags, outcomes, impression should not be included on IAM preview

Author: Jeasmine

OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationGMS.java

@@ -208,6 +208,13 @@ else if (permissionList.contains("android.permission.ACCESS_COARSE_LOCATION")) {
                      requestPermission = "android.permission.ACCESS_COARSE_LOCATION";
                }
 
+               // We handle the following cases:
+               //  1 - If needed and available then prompt for permissions
+               //       - Request permission can be ACCESS_COARSE_LOCATION or ACCESS_FINE_LOCATION
+               //  2 - If the permission were already granted then start getting location
+               //  3 - If permission wasn't granted then trigger fail flow
+               //
+               // For each case, we call the prompt handlers
                if (requestPermission != null && promptLocation) {
                   PermissionsActivity.startPrompt();
                } else if (locationCoarsePermission == PackageManager.PERMISSION_GRANTED) {

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageController.java

@@ -273,7 +273,7 @@ void onMessageActionOccurredOnMessage(@NonNull final OSInAppMessage message, @No
         action.firstClick = message.takeActionAsUnique();
 
         firePublicClickHandler(action);
-        showPrompts(message, action.prompts);
+        beginProcessingPrompts(message, action.prompts);
         fireClickAction(action);
         fireRESTCallForClick(message, action);
         fireTagCallForClick(action);
@@ -285,19 +285,31 @@ void onMessageActionOccurredOnPreview(@NonNull final OSInAppMessage message, @No
         action.firstClick = message.takeActionAsUnique();
 
         firePublicClickHandler(action);
+        beginProcessingPrompts(message, action.prompts);
         fireClickAction(action);
+        logInAppMessagePreviewActions(action);
     }
 
-    private void showPrompts(OSInAppMessage message, final List<OSInAppMessagePrompt> prompts) {
+    private void logInAppMessagePreviewActions(final OSInAppMessageAction action) {
+        if (action.tags != null)
+            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "Tags detected inside of the action click payload, ignoring because action came from IAM preview:: " + action.tags.toString());
+
+        if (action.outcomes.size() > 0)
+            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "Outcomes detected inside of the action click payload, ignoring because action came from IAM preview: " + action.outcomes.toString());
+
+        // TODO: Add more action payload preview logs here in future
+    }
+
+    private void beginProcessingPrompts(OSInAppMessage message, final List<OSInAppMessagePrompt> prompts) {
         if (prompts.size() > 0) {
             OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "IAM showing prompts from IAM: " + message.toString());
             // TODO until we don't fix the activity going forward or back dismissing the IAM, we need to auto dismiss
             WebViewManager.dismissCurrentInAppMessage();
-            handleMultiplePrompts(message, prompts);
+            showMultiplePrompts(message, prompts);
         }
     }
 
-    private void handleMultiplePrompts(final OSInAppMessage message, final List<OSInAppMessagePrompt> prompts) {
+    private void showMultiplePrompts(final OSInAppMessage message, final List<OSInAppMessagePrompt> prompts) {
         for (OSInAppMessagePrompt prompt : prompts) {
             // Don't show prompt twice
             if (!prompt.hasPrompted()) {
@@ -314,7 +326,7 @@ private void handleMultiplePrompts(final OSInAppMessage message, final List<OSIn
                 public void completed(boolean accepted) {
                     currentPrompt = null;
                     OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "IAM prompt to handle finished accepted: " + accepted);
-                    handleMultiplePrompts(message, prompts);
+                    showMultiplePrompts(message, prompts);
                 }
             });
         } else {

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageOutcome.java

@@ -60,4 +60,13 @@ public boolean isUnique() {
     public void setUnique(boolean unique) {
         this.unique = unique;
     }
+
+    @Override
+    public String toString() {
+        return "OSInAppMessageOutcome{" +
+                "name='" + name + '\'' +
+                ", weight=" + weight +
+                ", unique=" + unique +
+                '}';
+    }
 }

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageTag.java

@@ -50,4 +50,12 @@ public JSONArray getTagsToRemove() {
     public void setTagsToRemove(JSONArray tagsToRemove) {
         this.tagsToRemove = tagsToRemove;
     }
+
+    @Override
+    public String toString() {
+        return "OSInAppMessageTag{" +
+                "adds=" + tagsToAdd +
+                ", removes=" + tagsToRemove +
+                '}';
+    }
 }