Skip to content

Commit f85757a

Browse files
committed
refac: rename urlStrategy feilds to domains
- remove onResume after sdkInit and rely on SDK lifecycle
1 parent 06634c9 commit f85757a

File tree

2 files changed

+9
-44
lines changed

2 files changed

+9
-44
lines changed

Adjust/plugins/sdk-plugin-webbridge/src/main/assets/adjust_config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function AdjustConfig(appToken, environment, legacy) {
4141
this.deferredDeeplinkCallbackFunction = null;
4242
this.fbPixelDefaultEventToken = null;
4343
this.fbPixelMapping = [];
44-
this.urlStrategy = [];
44+
this.domains = [];
4545
this.useSubDomain = null;
4646
this.isDataResidency = null;
4747
this.isPreinstallTrackingEnabled = null;
@@ -205,8 +205,8 @@ AdjustConfig.prototype.addFbPixelMapping = function(fbEventNameKey, adjEventToke
205205
this.fbPixelMapping.push(adjEventTokenValue);
206206
};
207207

208-
AdjustConfig.prototype.setUrlStrategy = function(urlStrategy, useSubDomain , isDataResidency) {
209-
this.urlStrategy = urlStrategy;
208+
AdjustConfig.prototype.setUrlStrategy = function(domains, useSubDomain , isDataResidency) {
209+
this.domains = domains;
210210
this.useSubDomain = useSubDomain;
211211
this.isDataResidency = isDataResidency;
212212
};

Adjust/plugins/sdk-plugin-webbridge/src/main/java/com/adjust/sdk/webbridge/AdjustBridgeInstance.java

Lines changed: 6 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -69,36 +69,6 @@ public class AdjustBridgeInstance {
6969
setWebView(webView);
7070
}
7171

72-
// Automatically subscribe to Android lifecycle callbacks to properly handle session tracking.
73-
// This requires user to have minimal supported API level set to 14.
74-
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
75-
private static final class AdjustLifecycleCallbacks implements Application.ActivityLifecycleCallbacks {
76-
@Override
77-
public void onActivityResumed(Activity activity) {
78-
Adjust.onResume();
79-
}
80-
81-
@Override
82-
public void onActivityPaused(Activity activity) {
83-
Adjust.onPause();
84-
}
85-
86-
@Override
87-
public void onActivityStopped(Activity activity) {}
88-
89-
@Override
90-
public void onActivitySaveInstanceState(Activity activity, Bundle outState) {}
91-
92-
@Override
93-
public void onActivityDestroyed(Activity activity) {}
94-
95-
@Override
96-
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {}
97-
98-
@Override
99-
public void onActivityStarted(Activity activity) {}
100-
}
101-
10272
private boolean isInitialized() {
10373
if (webView == null) {
10474
AdjustBridgeUtil.getLogger().error("Webview missing. Call AdjustBridge.setWebView before");
@@ -165,7 +135,7 @@ public void initSdk(String adjustConfigString) {
165135
Object deferredDeeplinkCallbackNameField = jsonAdjustConfig.get("deferredDeeplinkCallbackName");
166136
Object fbPixelDefaultEventTokenField = jsonAdjustConfig.get("fbPixelDefaultEventToken");
167137
Object fbPixelMappingField = jsonAdjustConfig.get("fbPixelMapping");
168-
Object urlStrategyField = jsonAdjustConfig.get("urlStrategy");
138+
Object domainsField = jsonAdjustConfig.get("domains");
169139
Object useSubDomainField = jsonAdjustConfig.get("useSubDomain");
170140
Object isDataResidencyField = jsonAdjustConfig.get("isDataResidency");
171141
Object isPreinstallTrackingEnabledField = jsonAdjustConfig.get("isPreinstallTrackingEnabled");
@@ -344,13 +314,13 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
344314
}
345315

346316
// Set url strategy
347-
String[] urlStrategyArray = AdjustBridgeUtil.jsonArrayToArray((JSONArray) urlStrategyField);
348-
List<String> urlStrategy = Arrays.asList(urlStrategyArray);
317+
String[] domainsArray = AdjustBridgeUtil.jsonArrayToArray((JSONArray) domainsField);
318+
List<String> domains = Arrays.asList(domainsArray);
349319

350320
Boolean useSubDomain = AdjustBridgeUtil.fieldToBoolean(useSubDomainField);
351321
Boolean isDataResidency = AdjustBridgeUtil.fieldToBoolean(isDataResidencyField);
352-
if (urlStrategy != null && !urlStrategy.isEmpty() && useSubDomain != null && isDataResidency != null) {
353-
adjustConfig.setUrlStrategy(urlStrategy,useSubDomain,isDataResidency);
322+
if (domains != null && !domains.isEmpty() && useSubDomain != null && isDataResidency != null) {
323+
adjustConfig.setUrlStrategy(domains,useSubDomain,isDataResidency);
354324
}
355325

356326
// Preinstall tracking
@@ -400,15 +370,10 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
400370
adjustConfig.setEventDeduplicationIdsMaxSize(eventDeduplicationIdsMaxSize);
401371
}
402372

403-
// Manually call onResume() because web view initialisation will happen a bit delayed.
404-
// With this delay, it will miss lifecycle callback onResume() initial firing.
405373
Adjust.initSdk(adjustConfig);
406-
Adjust.onResume();
407374

408375
isInitialized = true;
409-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
410-
application.registerActivityLifecycleCallbacks(new AdjustLifecycleCallbacks());
411-
}
376+
412377
} catch (Exception e) {
413378
AdjustFactory.getLogger().error("AdjustBridgeInstance onCreate: %s", e.getMessage());
414379
}

0 commit comments

Comments
 (0)