Merge pull request #555 from adjust/v500_sdk2015

[android] Strip things from Android web bridge
adjust · May 29, 2024 · e290bf5 · e290bf5
2 parents 251e8ae + abcf2bf
commit e290bf5
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 52 deletions.
diff --git a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js
@@ -111,12 +111,6 @@ var Adjust = {
         }
     },
 
-    setPushToken: function(token) {
-        if (AdjustBridge) {
-            AdjustBridge.setPushToken(token);
-        }
-    },
-
     gdprForgetMe: function() {
         if (AdjustBridge) {
             AdjustBridge.gdprForgetMe();

diff --git a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust_config.js b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust_config.js
@@ -41,7 +41,6 @@ function AdjustConfig(appToken, environment, legacy) {
     this.deferredDeeplinkCallbackFunction = null;
     this.fbPixelDefaultEventToken = null;
     this.fbPixelMapping = [];
-    this.urlStrategy = null;
     this.preinstallTrackingEnabled = null;
     this.preinstallFilePath = null;
     this.fbAppId = null;
@@ -52,14 +51,6 @@ function AdjustConfig(appToken, environment, legacy) {
 AdjustConfig.EnvironmentSandbox = 'sandbox';
 AdjustConfig.EnvironmentProduction = 'production';
 
-AdjustConfig.UrlStrategyIndia = "url_strategy_india";
-AdjustConfig.UrlStrategyChina = "url_strategy_china";
-AdjustConfig.UrlStrategyCn = "url_strategy_cn";
-AdjustConfig.UrlStrategyCnOnly = "url_strategy_cn_only";
-AdjustConfig.DataResidencyEU = "data_residency_eu";
-AdjustConfig.DataResidencyTR = "data_residency_tr";
-AdjustConfig.DataResidencyUS = "data_residency_us";
-
 AdjustConfig.LogLevelVerbose = 'VERBOSE',
 AdjustConfig.LogLevelDebug = 'DEBUG',
 AdjustConfig.LogLevelInfo = 'INFO',
@@ -209,10 +200,6 @@ AdjustConfig.prototype.addFbPixelMapping = function(fbEventNameKey, adjEventToke
     this.fbPixelMapping.push(adjEventTokenValue);
 };
 
-AdjustConfig.prototype.setUrlStrategy = function(urlStrategy) {
-    this.urlStrategy = urlStrategy;
-};
-
 AdjustConfig.prototype.setPreinstallTrackingEnabled = function(preinstallTrackingEnabled) {
     this.preinstallTrackingEnabled = preinstallTrackingEnabled;
 };

diff --git a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust_event.js b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust_event.js
@@ -4,7 +4,6 @@ function AdjustEvent(eventToken) {
     this.currency = null;
     this.callbackParameters = [];
     this.partnerParameters = [];
-    this.orderId = null;
     this.deduplicationId = null;
     this.callbackId = null;
 }
@@ -24,10 +23,6 @@ AdjustEvent.prototype.addPartnerParameter = function(key, value) {
     this.partnerParameters.push(value);
 };
 
-AdjustEvent.prototype.setOrderId = function(orderId) {
-    this.orderId = orderId;
-};
-
 AdjustEvent.prototype.setDeduplicationId = function(deduplicationId) {
     this.deduplicationId = deduplicationId;
 };

diff --git a/Adjust/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeInstance.java b/Adjust/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeInstance.java
@@ -158,7 +158,6 @@ public void onCreate(String adjustConfigString) {
             Object deferredDeeplinkCallbackNameField = jsonAdjustConfig.get("deferredDeeplinkCallbackName");
             Object fbPixelDefaultEventTokenField = jsonAdjustConfig.get("fbPixelDefaultEventToken");
             Object fbPixelMappingField = jsonAdjustConfig.get("fbPixelMapping");
-            Object urlStrategyField = jsonAdjustConfig.get("urlStrategy");
             Object preinstallTrackingEnabledField = jsonAdjustConfig.get("preinstallTrackingEnabled");
             Object preinstallFilePathField = jsonAdjustConfig.get("preinstallFilePath");
             Object fbAppIdField = jsonAdjustConfig.get("fbAppId");
@@ -327,12 +326,6 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
                 AdjustFactory.getLogger().error("AdjustBridgeInstance.configureFbPixel: %s", e.getMessage());
             }
 
-            // Set url strategy
-            String urlStrategy = AdjustBridgeUtil.fieldToString(urlStrategyField);
-            if (urlStrategy != null) {
-                adjustConfig.setUrlStrategy(urlStrategy);
-            }
-
             // Preinstall tracking
             Boolean preinstallTrackingEnabled = AdjustBridgeUtil.fieldToBoolean(preinstallTrackingEnabledField);
             if (preinstallTrackingEnabled != null) {
@@ -390,7 +383,6 @@ public void trackEvent(String adjustEventString) {
             Object currencyField = jsonAdjustEvent.get("currency");
             Object callbackParametersField = jsonAdjustEvent.get("callbackParameters");
             Object partnerParametersField = jsonAdjustEvent.get("partnerParameters");
-            Object orderIdField = jsonAdjustEvent.get("orderId");
             Object deduplicationIdField = jsonAdjustEvent.get("deduplicationId");
             Object callbackIdField = jsonAdjustEvent.get("callbackId");
 
@@ -428,12 +420,6 @@ public void trackEvent(String adjustEventString) {
                 }
             }
 
-            // Order id
-            String orderId = AdjustBridgeUtil.fieldToString(orderIdField);
-            if (orderId != null) {
-                adjustEvent.setOrderId(orderId);
-            }
-
             // Revenue deduplication
             String deduplicationId = AdjustBridgeUtil.fieldToString(deduplicationIdField);
             if (deduplicationId != null) {
@@ -561,15 +547,6 @@ public void removeGlobalPartnerParameters() {
         Adjust.removeGlobalPartnerParameters();
     }
 
-    @JavascriptInterface
-    public void setPushToken(String pushToken) {
-        if (!isInitialized()) {
-            return;
-        }
-
-        Adjust.setPushToken(pushToken, application.getApplicationContext());
-    }
-
     @JavascriptInterface
     public void gdprForgetMe() {
         if (!isInitialized()) {

diff --git a/Adjust/test-app-webbridge/src/main/assets/command_executor.js b/Adjust/test-app-webbridge/src/main/assets/command_executor.js
@@ -454,11 +454,6 @@ AdjustCommandExecutor.prototype.event = function(params) {
         }
     }
 
-    if ('orderId' in params) {
-        var orderId = getFirstParameterValue(params, 'orderId');
-        adjustEvent.setOrderId(orderId);
-    }
-
     if ('deduplicationId' in params) {
         var deduplicationId = getFirstParameterValue(params, 'deduplicationId');
         adjustEvent.setDeduplicationId(deduplicationId);