Add tags to IAM

  * Add OSInAppMessageTag class
  * Add send Tags when available
  * Add remove Tags when available
  * Add test for new functionality

Author: Jeasmine

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

@@ -21,7 +21,10 @@ public class OSInAppMessageAction {
     private static final String CLICK_URL = "click_url";
     private static final String FIRST_CLICK = "first_click";
     private static final String CLOSES_MESSAGE = "closes_message";
+    //TODO when backend is ready check if key match
     private static final String OUTCOMES = "outcomes";
+    //TODO when backend is ready check if key match
+    private static final String TAGS = "tags";
 
     /**
      * UUID assigned by OneSignal for internal use.
@@ -54,6 +57,9 @@ public class OSInAppMessageAction {
     @NonNull
     public List<OSInAppMessageOutcome> outcomes = new ArrayList<>();
 
+    /** Tags for action */
+    public OSInAppMessageTag tags;
+
     /**
      * Determines if this was the first action taken on the in app message
      */
@@ -80,6 +86,9 @@ public class OSInAppMessageAction {
                 outcomes.add(new OSInAppMessageOutcome((JSONObject) outcomesJsonArray.get(i)));
             }
         }
+
+        if (json.has(TAGS))
+            tags = new OSInAppMessageTag(json.getJSONObject(TAGS));
     }
 
     public JSONObject toJSONObject() {
@@ -95,6 +104,9 @@ public JSONObject toJSONObject() {
                 outcomesJson.put(outcome.toJSONObject());
 
             mainObj.put(OUTCOMES, outcomesJson);
+
+            if (tags != null)
+                mainObj.put(TAGS, tags.toJSONObject());
             // Omitted for now until necessary
 //            if (urlTarget != null)
 //                mainObj.put("url_target", urlTarget.toJSONObject());

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

@@ -274,6 +274,7 @@ void onMessageActionOccurredOnMessage(@NonNull final OSInAppMessage message, @No
         firePublicClickHandler(action);
         fireClickAction(action);
         fireRESTCallForClick(message, action);
+        fireTagCallForClick(action);
         fireOutcomesForClick(action.outcomes);
     }
 
@@ -301,6 +302,17 @@ private void fireOutcomesForClick(@NonNull final List<OSInAppMessageOutcome> out
         }
     }
 
+    private void fireTagCallForClick(@NonNull final OSInAppMessageAction action) {
+        if (action.tags != null) {
+            OSInAppMessageTag tags = action.tags;
+
+            if (tags.getTagsToAdd() != null)
+                OneSignal.sendTags(tags.getTagsToAdd());
+            if (tags.getTagsToRemove() != null)
+                OneSignal.deleteTags(tags.getTagsToRemove(), null);
+        }
+    }
+
     private void firePublicClickHandler(@NonNull final OSInAppMessageAction action) {
         if (OneSignal.mInitBuilder.mInAppMessageClickHandler == null)
             return;

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

@@ -0,0 +1,53 @@
+package com.onesignal;
+
+import android.support.annotation.NonNull;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class OSInAppMessageTag {
+
+    //TODO when backend is ready check if key match
+    private static final String ADD_TAGS = "adds";
+    //TODO when backend is ready check if key match
+    private static final String REMOVE_TAGS = "removes";
+
+    private JSONObject tagsToAdd;
+    private JSONArray tagsToRemove;
+
+    OSInAppMessageTag(@NonNull JSONObject json) throws JSONException {
+        tagsToAdd = json.has(ADD_TAGS) ? json.getJSONObject(ADD_TAGS) : null;
+        tagsToRemove = json.has(REMOVE_TAGS) ? json.getJSONArray(REMOVE_TAGS) : null;
+    }
+
+    public JSONObject toJSONObject() {
+        JSONObject mainObj = new JSONObject();
+        try {
+            if (tagsToAdd != null)
+                mainObj.put(ADD_TAGS, tagsToAdd);
+            if (tagsToRemove != null)
+                mainObj.put(REMOVE_TAGS, tagsToRemove);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return mainObj;
+    }
+
+    public JSONObject getTagsToAdd() {
+        return tagsToAdd;
+    }
+
+    public void setTagsToAdd(JSONObject tagsToAdd) {
+        this.tagsToAdd = tagsToAdd;
+    }
+
+    public JSONArray getTagsToRemove() {
+        return tagsToRemove;
+    }
+
+    public void setTagsToRemove(JSONArray tagsToRemove) {
+        this.tagsToRemove = tagsToRemove;
+    }
+}

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

@@ -1858,13 +1858,20 @@ public static void deleteTags(String jsonArrayString) {
    }
 
    public static void deleteTags(String jsonArrayString, ChangeTagsUpdateHandler handler) {
+      try {
+         deleteTags(new JSONArray(jsonArrayString), handler);
+      } catch (Throwable t) {
+         Log(LOG_LEVEL.ERROR, "Failed to generate JSON for deleteTags.", t);
+      }
+   }
+
+   public static void deleteTags(JSONArray jsonArray, ChangeTagsUpdateHandler handler) {
       //if applicable, check if the user provided privacy consent
       if (shouldLogUserPrivacyConsentErrorMessageForMethodName("deleteTags()"))
          return;
 
       try {
          JSONObject jsonTags = new JSONObject();
-         JSONArray jsonArray = new JSONArray(jsonArrayString);
 
          for (int i = 0; i < jsonArray.length(); i++)
             jsonTags.put(jsonArray.getString(i), "");

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

@@ -458,7 +458,6 @@ boolean getSyncAsNewSession() {
         return getUserStateForModification().dependValues.optBoolean("session" );
     }
 
-
     void sendTags(JSONObject tags, @Nullable ChangeTagsUpdateHandler handler) {
         if (handler != null)
             this.sendTagsHandlers.add(handler);

OneSignalSDK/unittest/src/test/java/com/onesignal/OneSignalPackagePrivateHelper.java

@@ -24,6 +24,7 @@
 import static org.robolectric.Shadows.shadowOf;
 
 public class OneSignalPackagePrivateHelper {
+   public static final String IN_APP_MESSAGES_JSON_KEY = com.onesignal.OSInAppMessageController.IN_APP_MESSAGES_JSON_KEY;
 
    private static abstract class RunnableArg<T> {
       abstract void run(T object) throws Exception;
@@ -461,6 +462,14 @@ public static ArrayList<com.onesignal.OSInAppMessage> getInAppMessageDisplayQueu
       return com.onesignal.OSInAppMessageController.getController().getInAppMessageDisplayQueue();
    }
 
+   public static void onMessageActionOccurredOnMessage(@NonNull final com.onesignal.OSInAppMessage message, @NonNull final JSONObject actionJson) throws JSONException {
+      com.onesignal.OSInAppMessageController.getController().onMessageActionOccurredOnMessage(message, actionJson);
+   }
+
+   public static void onMessageWasShown(@NonNull com.onesignal.OSInAppMessage message) {
+      com.onesignal.OSInAppMessageController.getController().onMessageWasShown(message);
+   }
+
    public static List<OSTestInAppMessage> getRedisplayInAppMessages() {
       List<OSInAppMessage> messages = com.onesignal.OSInAppMessageController.getController().getRedisplayedInAppMessages();
       List<OSTestInAppMessage> testMessages = new ArrayList<>();
@@ -478,29 +487,6 @@ public static List<OSTestInAppMessage> getRedisplayInAppMessages() {
       return testMessages;
    }
 
-   public static class OSInAppMessageController {
-      public static final String IN_APP_MESSAGES_JSON_KEY = com.onesignal.OSInAppMessageController.IN_APP_MESSAGES_JSON_KEY;
-      private static OSInAppMessageController sharedInstance;
-
-      OSInAppMessageController() {
-      }
-
-      public static OSInAppMessageController getController() {
-         if (sharedInstance == null)
-            sharedInstance = new OSInAppMessageController();
-
-         return sharedInstance;
-      }
-
-      public void onMessageActionOccurredOnMessage(@NonNull final com.onesignal.OSInAppMessage message, @NonNull final JSONObject actionJson) throws JSONException {
-         com.onesignal.OSInAppMessageController.getController().onMessageActionOccurredOnMessage(message, actionJson);
-      }
-
-      public void onMessageWasShown(@NonNull com.onesignal.OSInAppMessage message) {
-         com.onesignal.OSInAppMessageController.getController().onMessageWasShown(message);
-      }
-   }
-
    public static boolean hasConfigChangeFlag(Activity activity, int configChangeFlag) {
       return OSUtils.hasConfigChangeFlag(activity, configChangeFlag);
    }
@@ -527,5 +513,8 @@ protected WebViewManager(@NonNull com.onesignal.OSInAppMessage message, @NonNull
    }
 
 
-   public static class JSONUtils extends com.onesignal.JSONUtils {}
+   public static class JSONUtils extends com.onesignal.JSONUtils {
+
+
+   }
 }

OneSignalSDK/unittest/src/test/java/com/onesignal/StaticResetHelper.java

@@ -54,7 +54,6 @@ public boolean onOtherField(Field field) throws Exception {
             return false;
          }
       }));
-      classes.add(new ClassState(OneSignalPackagePrivateHelper.OSInAppMessageController.class, null));
       classes.add(new ClassState(FocusTimeController.class, null));
       classes.add(new ClassState(OSSessionManager.class, null));
       classes.add(new ClassState(MockSessionManager.class, null));