Merge pull request #396 from Iterable/jay/MOB-3673-in-app-close-sig

[MOB-3673] allow clickedUrl to be null in trackInAppClose

Author: roninopf

iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java

@@ -724,7 +724,7 @@ public void trackInAppClick(@NonNull IterableInAppMessage message, @NonNull Stri
      * @param closeAction the method of how the in-app was closed
      * @param clickLocation the location of the in-app for this event
      */
-    void trackInAppClose(@NonNull IterableInAppMessage message, @NonNull String clickedURL, @NonNull IterableInAppCloseAction closeAction, @NonNull IterableInAppLocation clickLocation) {
+    public void trackInAppClose(@NonNull IterableInAppMessage message, @Nullable String clickedURL, @NonNull IterableInAppCloseAction closeAction, @NonNull IterableInAppLocation clickLocation) {
         if (!checkSDKInitialization()) {
             return;
         }

iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java

@@ -275,21 +275,23 @@ public void trackInAppClick(@NonNull IterableInAppMessage message, @NonNull Stri
         }
     }
 
-    void trackInAppClose(@NonNull IterableInAppMessage message, @NonNull String clickedURL, @NonNull IterableInAppCloseAction closeAction, @NonNull IterableInAppLocation clickLocation, @Nullable String inboxSessionId) {
+    void trackInAppClose(@NonNull IterableInAppMessage message, @Nullable String clickedURL, @NonNull IterableInAppCloseAction closeAction, @NonNull IterableInAppLocation clickLocation, @Nullable String inboxSessionId) {
         JSONObject requestJSON = new JSONObject();
 
         try {
             addEmailOrUserIdToJson(requestJSON);
-            requestJSON.put(IterableConstants.KEY_EMAIL, authProvider.getEmail());
-            requestJSON.put(IterableConstants.KEY_USER_ID, authProvider.getUserId());
+//            requestJSON.put(IterableConstants.KEY_EMAIL, authProvider.getEmail()); // not needed due to addEmailOrUserIdToJson(requestJSON)?
+//            requestJSON.put(IterableConstants.KEY_USER_ID, authProvider.getUserId()); // not needed due to addEmailOrUserIdToJson(requestJSON)?
             requestJSON.put(IterableConstants.KEY_MESSAGE_ID, message.getMessageId());
-            requestJSON.put(IterableConstants.ITERABLE_IN_APP_CLICKED_URL, clickedURL);
+            requestJSON.putOpt(IterableConstants.ITERABLE_IN_APP_CLICKED_URL, clickedURL);
             requestJSON.put(IterableConstants.ITERABLE_IN_APP_CLOSE_ACTION, closeAction.toString());
             requestJSON.put(IterableConstants.KEY_MESSAGE_CONTEXT, getInAppMessageContext(message, clickLocation));
             requestJSON.put(IterableConstants.KEY_DEVICE_INFO, getDeviceInfoJson());
+
             if (clickLocation == IterableInAppLocation.INBOX) {
                 addInboxSessionID(requestJSON, inboxSessionId);
             }
+
             sendPostRequest(IterableConstants.ENDPOINT_TRACK_INAPP_CLOSE, requestJSON);
         } catch (JSONException e) {
             e.printStackTrace();