Remove allowedProtocols passing between modules

1. Only place to check if the url is allowed is through the Util method which checks the allowedProtocols list from config.
2. Removed method signatures that were introduced because of this
3. Test methods update
4. Logs if the url was blocked

Author: Ayyanchira

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

@@ -18,20 +18,12 @@ class IterableActionRunner {
     static IterableActionRunnerImpl instance = new IterableActionRunnerImpl();
 
     static boolean executeAction(@NonNull Context context, @Nullable IterableAction action, @NonNull IterableActionSource source) {
-        return instance.executeAction(context, action, source, IterableApi.getInstance().config.allowedProtocols);
-    }
-
-    static boolean executeAction(@NonNull Context context, @Nullable IterableAction action, @NonNull IterableActionSource source, @NonNull String[] allowedProtocols) {
-        return instance.executeAction(context, action, source, allowedProtocols);
+        return instance.executeAction(context, action, source);
     }
 
     static class IterableActionRunnerImpl {
         private static final String TAG = "IterableActionRunner";
 
-        boolean executeAction(@NonNull Context context, @Nullable IterableAction action, @NonNull IterableActionSource source) {
-            return executeAction(context, action, source, IterableApi.getInstance().config.allowedProtocols);
-        }
-
         /**
          * Execute an {@link IterableAction} as a response to push action
          *
@@ -40,15 +32,15 @@ boolean executeAction(@NonNull Context context, @Nullable IterableAction action,
          * @param allowedProtocols protocols that the SDK is allowed to open in addition to `https`
          * @return `true` if the action was handled, `false` if it was not
          */
-        boolean executeAction(@NonNull Context context, @Nullable IterableAction action, @NonNull IterableActionSource source, @NonNull String[] allowedProtocols) {
+        boolean executeAction(@NonNull Context context, @Nullable IterableAction action, @NonNull IterableActionSource source) {
             if (action == null) {
                 return false;
             }
 
             IterableActionContext actionContext = new IterableActionContext(action, source);
 
             if (action.isOfType(IterableAction.ACTION_TYPE_OPEN_URL)) {
-                return openUri(context, Uri.parse(action.getData()), actionContext, allowedProtocols);
+                return openUri(context, Uri.parse(action.getData()), actionContext);
             } else {
                 return callCustomActionIfSpecified(action, actionContext);
             }
@@ -65,10 +57,9 @@ boolean executeAction(@NonNull Context context, @Nullable IterableAction action,
          * @return `true` if the action was handled, or an activity was found for this URL
          * `false` if the handler did not handle this URL and no activity was found to open it with
          */
-        private boolean openUri(@NonNull Context context, @NonNull Uri uri, @NonNull IterableActionContext actionContext, String[] allowedProtocols) {
+        private boolean openUri(@NonNull Context context, @NonNull Uri uri, @NonNull IterableActionContext actionContext) {
             // Handle URL: check for deep links within the app
-            if (!IterableUtil.isUrlOpenAllowed(uri.toString(), allowedProtocols)) {
-                IterableLogger.e(TAG, "URL was not in the allowed protocols list");
+            if (!IterableUtil.isUrlOpenAllowed(uri.toString())) {
                 return false;
             }
 

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

@@ -402,7 +402,7 @@ public void setUserId(@Nullable String userId) {
      *                   or the original url if it is not an Iterable link.
      */
     public void getAndTrackDeepLink(@NonNull String uri, @NonNull IterableHelper.IterableActionHandler onCallback) {
-        IterableDeeplinkManager.getAndTrackDeeplink(uri, onCallback, config.allowedProtocols);
+        IterableDeeplinkManager.getAndTrackDeeplink(uri, onCallback);
     }
 
     /**
@@ -427,7 +427,7 @@ public void execute(String originalUrl) {
                     IterableAction action = IterableAction.actionOpenUrl(originalUrl);
                     IterableActionRunner.executeAction(getInstance().getMainActivityContext(), action, IterableActionSource.APP_LINK);
                 }
-            }, sharedInstance.config.allowedProtocols);
+            });
             return true;
         } else {
             IterableAction action = IterableAction.actionOpenUrl(uri);

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

@@ -22,19 +22,8 @@ class IterableDeeplinkManager {
      * @param callback The callback to execute the original URL is retrieved
      */
     static void getAndTrackDeeplink(@Nullable String url, @NonNull IterableHelper.IterableActionHandler callback) {
-        IterableDeeplinkManager.getAndTrackDeeplink(url, callback, new String[0]);
-    }
-
-    /**
-     * Tracks a link click and passes the redirected URL to the callback
-     * @param url The URL that was clicked
-     * @param callback The callback to execute the original URL is retrieved
-     * @param allowedProtocols a list of protocols (on top of `https`) to allow opening
-     */
-    static void getAndTrackDeeplink(@Nullable String url, @NonNull IterableHelper.IterableActionHandler callback, @NonNull String[] allowedProtocols) {
         if (url != null) {
-            if (!IterableUtil.isUrlOpenAllowed(url, allowedProtocols)) {
-                IterableLogger.e(TAG, "URL was not in the allowed protocols list");
+            if (!IterableUtil.isUrlOpenAllowed(url)) {
                 return;
             }
 

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

@@ -271,17 +271,17 @@ public void handleInAppClick(@NonNull IterableInAppMessage message, @Nullable Ur
             if (urlString.startsWith(IterableConstants.URL_SCHEME_ACTION)) {
                 // This is an action:// URL, pass that to the custom action handler
                 String actionName = urlString.replace(IterableConstants.URL_SCHEME_ACTION, "");
-                IterableActionRunner.executeAction(context, IterableAction.actionCustomAction(actionName), IterableActionSource.IN_APP, IterableApi.getInstance().config.allowedProtocols);
+                IterableActionRunner.executeAction(context, IterableAction.actionCustomAction(actionName), IterableActionSource.IN_APP);
             } else if (urlString.startsWith(IterableConstants.URL_SCHEME_ITBL)) {
                 // Handle itbl:// URLs, pass that to the custom action handler for compatibility
                 String actionName = urlString.replace(IterableConstants.URL_SCHEME_ITBL, "");
-                IterableActionRunner.executeAction(context, IterableAction.actionCustomAction(actionName), IterableActionSource.IN_APP, IterableApi.getInstance().config.allowedProtocols);
+                IterableActionRunner.executeAction(context, IterableAction.actionCustomAction(actionName), IterableActionSource.IN_APP);
             } else if (urlString.startsWith(IterableConstants.URL_SCHEME_ITERABLE)) {
                 // Handle iterable:// URLs - reserved for actions defined by the SDK only
                 String actionName = urlString.replace(IterableConstants.URL_SCHEME_ITERABLE, "");
                 handleIterableCustomAction(actionName, message);
             } else {
-                IterableActionRunner.executeAction(context, IterableAction.actionOpenUrl(urlString), IterableActionSource.IN_APP, IterableApi.getInstance().config.allowedProtocols);
+                IterableActionRunner.executeAction(context, IterableAction.actionOpenUrl(urlString), IterableActionSource.IN_APP);
             }
         }
     }

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

@@ -279,17 +279,19 @@ boolean writeFile(File file, String content) {
         }
     }
 
-    static boolean isUrlOpenAllowed(@NonNull String url, @NonNull String[] allowedProtocols) {
+    static boolean isUrlOpenAllowed(@NonNull String url) {
         String urlProtocol = url.split("://")[0];
-        if(urlProtocol.equals("https")){
+        if (urlProtocol.equals("https")) {
             return true;
         }
-        for (String allowedProtocol : allowedProtocols) {
+
+        for (String allowedProtocol : IterableApi.getInstance().config.allowedProtocols) {
             if (urlProtocol.equals(allowedProtocol)) {
                 return true;
             }
         }
 
+        IterableLogger.d(TAG, urlProtocol + " is not in the allowed protocols");
         return false;
     }
 }

iterableapi/src/test/java/com/iterable/iterableapi/IterablePushActionReceiverTest.java

@@ -80,7 +80,7 @@ public void testTrackPushOpenWithCustomAction() throws Exception {
 
         // Verify that IterableActionRunner was called with the proper action
         ArgumentCaptor<IterableAction> capturedAction = ArgumentCaptor.forClass(IterableAction.class);
-        verify(actionRunnerMock).executeAction(any(Context.class), capturedAction.capture(), eq(IterableActionSource.PUSH), eq(new String[0]));
+        verify(actionRunnerMock).executeAction(any(Context.class), capturedAction.capture(), eq(IterableActionSource.PUSH));
         assertEquals("customAction", capturedAction.getValue().getType());
 
         // Verify that the main app activity was launched
@@ -133,7 +133,7 @@ public void testPushActionWithTextInput() throws Exception {
 
         // Verify that IterableActionRunner was called with the proper action
         ArgumentCaptor<IterableAction> actionCaptor = ArgumentCaptor.forClass(IterableAction.class);
-        verify(actionRunnerMock).executeAction(any(Context.class), actionCaptor.capture(), eq(IterableActionSource.PUSH), eq(new String[0]));
+        verify(actionRunnerMock).executeAction(any(Context.class), actionCaptor.capture(), eq(IterableActionSource.PUSH));
         IterableAction capturedAction = actionCaptor.getValue();
         assertEquals("handleTextInput", capturedAction.getType());
         assertEquals("input text", capturedAction.userInput);
@@ -151,7 +151,7 @@ public void testLegacyDeepLinkPayload() throws Exception {
 
         // Verify that IterableActionRunner was called with openUrl action
         ArgumentCaptor<IterableAction> capturedAction = ArgumentCaptor.forClass(IterableAction.class);
-        verify(actionRunnerMock).executeAction(any(Context.class), capturedAction.capture(), eq(IterableActionSource.PUSH), eq(new String[0]));
+        verify(actionRunnerMock).executeAction(any(Context.class), capturedAction.capture(), eq(IterableActionSource.PUSH));
         assertEquals("openUrl", capturedAction.getValue().getType());
         assertEquals("https://example.com", capturedAction.getValue().getData());
     }