Patch 1

Author: Ayyanchira

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

@@ -11,14 +11,15 @@
 
 import android.util.Log;
 
+import java.util.Arrays;
 import java.util.List;
 
 class IterableActionRunner {
     @VisibleForTesting
     static IterableActionRunnerImpl instance = new IterableActionRunnerImpl();
 
     static boolean executeAction(@NonNull Context context, @Nullable IterableAction action, @NonNull IterableActionSource source) {
-        return instance.executeAction(context, action, source, new String[0]);
+        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) {
@@ -29,7 +30,7 @@ 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, new String[0]);
+            return executeAction(context, action, source, IterableApi.getInstance().config.allowedProtocols);
         }
 
         /**
@@ -66,18 +67,18 @@ boolean executeAction(@NonNull Context context, @Nullable IterableAction action,
          * `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) {
-            if (IterableApi.sharedInstance.config.urlHandler != null) {
-                if (IterableApi.sharedInstance.config.urlHandler.handleIterableURL(uri, actionContext)) {
-                    return true;
-                }
-            }
-
             // Handle URL: check for deep links within the app
             if (!isUrlOpenAllowed(uri.toString(), allowedProtocols)) {
                 IterableLogger.e(TAG, "URL was not in the allowed protocols list");
                 return false;
             }
 
+            if (IterableApi.sharedInstance.config.urlHandler != null) {
+                if (IterableApi.sharedInstance.config.urlHandler.handleIterableURL(uri, actionContext)) {
+                    return true;
+                }
+            }
+
             Intent intent = new Intent(Intent.ACTION_VIEW);
             intent.setData(uri);
 

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

@@ -427,7 +427,7 @@ public void execute(String originalUrl) {
                     IterableAction action = IterableAction.actionOpenUrl(originalUrl);
                     IterableActionRunner.executeAction(getInstance().getMainActivityContext(), action, IterableActionSource.APP_LINK);
                 }
-            }, config.allowedProtocols);
+            }, sharedInstance.config.allowedProtocols);
             return true;
         } else {
             IterableAction action = IterableAction.actionOpenUrl(uri);