refac: clean up web bridge deferred deep link opening logic

Author: uerceg

AdjustBridge/AdjustBridge.m

@@ -13,7 +13,7 @@
 
 @interface AdjustBridge() <AdjustDelegate>
 
-@property BOOL openDeferredDeeplink;
+@property BOOL isDeferredDeeplinkOpeningEnabled;
 @property (nonatomic, copy) NSString *fbPixelDefaultEventToken;
 @property (nonatomic, copy) NSString *attributionCallbackName;
 @property (nonatomic, copy) NSString *eventSuccessCallbackName;
@@ -39,7 +39,10 @@ - (id)init {
     }
 
     _bridgeRegister = nil;
+    self.isDeferredDeeplinkOpeningEnabled = YES;
+
     [self resetAdjustBridge];
+
     return self;
 }
 
@@ -148,7 +151,7 @@ - (BOOL)adjustDeferredDeeplinkReceived:(NSURL *)deeplink {
     if (self.deferredDeeplinkCallbackName) {
         [self.bridgeRegister callHandler:self.deferredDeeplinkCallbackName data:[deeplink absoluteString]];
     }
-    return self.openDeferredDeeplink;
+    return self.isDeferredDeeplinkOpeningEnabled;
 }
 
 - (void)adjustSkanUpdatedWithConversionData:(nonnull NSDictionary<NSString *, NSString *> *)data {
@@ -205,7 +208,7 @@ - (void)loadWKWebViewBridge:(WKWebView *)wkWebView
         NSNumber *isAdServicesEnabled = [data objectForKey:@"isAdServicesEnabled"];
         NSNumber *isIdfaReadingAllowed = [data objectForKey:@"isIdfaReadingAllowed"];
         NSNumber *isSkanAttributionHandlingEnabled = [data objectForKey:@"isSkanAttributionHandlingEnabled"];
-        NSNumber *openDeferredDeeplink = [data objectForKey:@"openDeferredDeeplink"];
+        NSNumber *isDeferredDeeplinkOpeningEnabled = [data objectForKey:@"isDeferredDeeplinkOpeningEnabled"];
         NSString *fbPixelDefaultEventToken = [data objectForKey:@"fbPixelDefaultEventToken"];
         id fbPixelMapping = [data objectForKey:@"fbPixelMapping"];
         NSString *attributionCallback = [data objectForKey:@"attributionCallback"];
@@ -277,8 +280,8 @@ - (void)loadWKWebViewBridge:(WKWebView *)wkWebView
                 [adjustConfig disableSkanAttribution];
             }
         }
-        if ([self isFieldValid:openDeferredDeeplink]) {
-            self.openDeferredDeeplink = [openDeferredDeeplink boolValue];
+        if ([self isFieldValid:isDeferredDeeplinkOpeningEnabled]) {
+            self.isDeferredDeeplinkOpeningEnabled = [isDeferredDeeplinkOpeningEnabled boolValue];
         }
         if ([self isFieldValid:fbPixelDefaultEventToken]) {
             self.fbPixelDefaultEventToken = fbPixelDefaultEventToken;

AdjustBridge/AdjustBridgeRegister.m

@@ -337,7 +337,7 @@ + (NSString *)adjust_js {
             this.isAdServicesEnabled = null;
             this.isIdfaReadingAllowed = null;
             this.isSkanAttributionHandlingEnabled = null;
-            this.openDeferredDeeplink = null;
+            this.isDeferredDeeplinkOpeningEnabled = null;
             this.fbPixelDefaultEventToken = null;
             this.fbPixelMapping = [];
             this.attributionCallback = null;
@@ -411,8 +411,8 @@ + (NSString *)adjust_js {
         AdjustConfig.prototype.disableSkanAttributionHandling = function() {
             this.isSkanAttributionHandlingEnabled = false;
         };
-        AdjustConfig.prototype.setOpenDeferredDeeplink = function(shouldOpen) {
-            this.openDeferredDeeplink = shouldOpen;
+        AdjustConfig.prototype.disableDeferredDeeplinkOpening = function() {
+            this.isDeferredDeeplinkOpeningEnabled = false;
         };
         AdjustConfig.prototype.setAttributionCallback = function(callback) {
             this.attributionCallback = callback;

AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp/TestLibraryBridge.js

@@ -358,12 +358,9 @@ AdjustCommandExecutor.prototype.config = function(params) {
 
     if ('deferredDeeplinkCallback' in params) {
         console.log('AdjustCommandExecutor.prototype.config deferredDeeplinkCallback');
-        var shouldOpenDeeplinkS = getFirstValue(params, 'deferredDeeplinkCallback');
-        if (shouldOpenDeeplinkS === 'true') {
-            adjustConfig.setOpenDeferredDeeplink(true);
-        }
-        if (shouldOpenDeeplinkS === 'false') {
-            adjustConfig.setOpenDeferredDeeplink(false);
+        var isOpeningDeferredDeeplinkEnabledS = getFirstValue(params, 'deferredDeeplinkCallback');
+        if (isOpeningDeferredDeeplinkEnabledS === 'false') {
+            adjustConfig.disableDeferredDeeplinkOpening();
         }
         var extraPath = this.extraPath;
         adjustConfig.setDeferredDeeplinkCallback(

examples/AdjustExample-WebView/AdjustExample-WebView/AdjustExample-WebView.html

@@ -28,8 +28,6 @@ <h1 style="width:300px;height:35px;text-align:center;">Adjust Web View Demo</h1>
         let adjustConfig = new AdjustConfig('2fm9gkqubvpc', AdjustConfig.EnvironmentSandbox);
         adjustConfig.setLogLevel(AdjustConfig.LogLevelVerbose);
 
-        adjustConfig.setOpenDeferredDeeplink(true)     // Just for test, is true by default.
-
         adjustConfig.setAttributionCallback(function(attribution) {
             console.log('Tracker token = ' + attribution.trackerToken + '\n' +
                   'Tracker name = ' + attribution.trackerName + '\n' +