Add push prompt handling for IAM clicks

  * Add prompt to IAM action
  * Show iOS prompt for location permission
  * Add test for prompt

Author: Jeasmine

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

@@ -334,8 +334,7 @@ public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
          fireFailedComplete();
       }
    }
-   
-   
+
    static class LocationUpdateListener implements LocationListener {
 
       private GoogleApiClient mGoogleApiClient;

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

@@ -10,6 +10,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.onesignal.OSInAppMessageLocationPrompt.LOCATION_PROMPT_KEY;
+
 public class OSInAppMessageAction {
 
     private static final String ID = "id";
@@ -25,6 +27,8 @@ public class OSInAppMessageAction {
     private static final String OUTCOMES = "outcomes";
     //TODO when backend is ready check if key match
     private static final String TAGS = "tags";
+    //TODO when backend is ready check if key match
+    private static final String PROMPTS = "prompts";
 
     /**
      * UUID assigned by OneSignal for internal use.
@@ -57,6 +61,12 @@ public class OSInAppMessageAction {
     @NonNull
     public List<OSInAppMessageOutcome> outcomes = new ArrayList<>();
 
+    /**
+     * Prompts for action
+     */
+    @NonNull
+    public List<OSInAppMessagePrompt> prompts = new ArrayList<>();
+
     /** Tags for action */
     public OSInAppMessageTag tags;
 
@@ -80,15 +90,30 @@ public class OSInAppMessageAction {
 
         closesMessage = json.optBoolean(CLOSE, true);
 
-        if (json.has(OUTCOMES)) {
-            JSONArray outcomesJsonArray = json.getJSONArray(OUTCOMES);
-            for (int i = 0; i < outcomesJsonArray.length(); i++) {
-                outcomes.add(new OSInAppMessageOutcome((JSONObject) outcomesJsonArray.get(i)));
-            }
-        }
+        if (json.has(OUTCOMES))
+            parseOutcomes(json);
 
         if (json.has(TAGS))
             tags = new OSInAppMessageTag(json.getJSONObject(TAGS));
+
+        if (json.has(PROMPTS))
+            parsePrompts(json);
+    }
+
+    private void parseOutcomes(JSONObject json) throws JSONException {
+        JSONArray outcomesJsonArray = json.getJSONArray(OUTCOMES);
+        for (int i = 0; i < outcomesJsonArray.length(); i++) {
+            outcomes.add(new OSInAppMessageOutcome((JSONObject) outcomesJsonArray.get(i)));
+        }
+    }
+
+    private void parsePrompts(JSONObject json) throws JSONException {
+        JSONArray promptsJsonArray = json.getJSONArray(PROMPTS);
+        for (int i = 0; i < promptsJsonArray.length(); i++) {
+            if (promptsJsonArray.get(i).equals(LOCATION_PROMPT_KEY) ) {
+                prompts.add(new OSInAppMessageLocationPrompt());
+            }
+        }
     }
 
     public JSONObject toJSONObject() {

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

@@ -272,6 +272,7 @@ void onMessageActionOccurredOnMessage(@NonNull final OSInAppMessage message, @No
         action.firstClick = message.takeActionAsUnique();
 
         firePublicClickHandler(action);
+        firePrompt(message, action.prompts);
         fireClickAction(action);
         fireRESTCallForClick(message, action);
         fireTagCallForClick(action);
@@ -286,6 +287,19 @@ void onMessageActionOccurredOnPreview(@NonNull final OSInAppMessage message, @No
         fireClickAction(action);
     }
 
+    private void firePrompt(OSInAppMessage message, final List<OSInAppMessagePrompt> prompts) {
+        for (OSInAppMessagePrompt prompt : prompts) {
+            // TODO until we don't fix the activity going forward or back dismissing the IAM, we need to auto dismiss
+            messageWasDismissed(message);
+            prompt.handlePrompt(new OneSignal.OperationCompletedCallback() {
+                @Override
+                public void completed(boolean result) {
+                    // TODO take care of multiple prompts
+                }
+            });
+        }
+    }
+
     //TODO This is a temporal solution for IAMs outcomes
     //     and will potentially change when we track IAMs
     private void fireOutcomesForClick(@NonNull final List<OSInAppMessageOutcome> outcomes) {

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

@@ -0,0 +1,12 @@
+package com.onesignal;
+
+class OSInAppMessageLocationPrompt extends OSInAppMessagePrompt {
+
+    static final String LOCATION_PROMPT_KEY = "location";
+
+    @Override
+    void handlePrompt(OneSignal.OperationCompletedCallback callback) {
+        OneSignal.promptLocation(callback);
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package com.onesignal;
+
+abstract class OSInAppMessagePrompt {
+
+    private boolean didAppear = false;
+
+    OSInAppMessagePrompt() {
+    }
+
+    abstract void handlePrompt(OneSignal.OperationCompletedCallback callback);
+
+    public boolean didAppear() {
+        return didAppear;
+    }
+
+    public void setDidAppear(boolean didAppear) {
+        this.didAppear = didAppear;
+    }
+}

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

@@ -2486,7 +2486,10 @@ public static void setLocationShared(boolean enable) {
     * @see <a href="https://documentation.onesignal.com/docs/permission-requests">Permission Requests | OneSignal Docs</a>
     */
    public static void promptLocation() {
+      promptLocation(null);
+   }
 
+   static void promptLocation(@Nullable final OperationCompletedCallback callback) {
       //if applicable, check if the user provided privacy consent
       if (shouldLogUserPrivacyConsentErrorMessageForMethodName("promptLocation()"))
          return;
@@ -2501,6 +2504,9 @@ public LocationGMS.CALLBACK_TYPE getType() {
                }
                @Override
                public void complete(LocationGMS.LocationPoint point) {
+                  if (callback != null) {
+                     callback.completed(point != null);
+                  }
                   //if applicable, check if the user provided privacy consent
                   if (shouldLogUserPrivacyConsentErrorMessageForMethodName("promptLocation()"))
                      return;
@@ -3226,4 +3232,7 @@ public interface OutcomeCallback {
     * End OneSignalOutcome module
     */
 
+   interface OperationCompletedCallback {
+      void completed(boolean result);
+   }
 }