Skip to content

Commit 33f58e9

Browse files
uerceguerceg
authored
Merge pull request #565 from adjust/v500_cleanup
SDK v5 cleanup
2 parents d745617 + 51e0113 commit 33f58e9

File tree

21 files changed

+286
-517
lines changed

21 files changed

+286
-517
lines changed

‎Adjust/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ext {
99
coreMinSdkVersion = 21
1010
coreCompileSdkVersion = 34
1111
coreTargetSdkVersion = 34
12-
coreVersionName = '5.0.0'
12+
coreVersionName = '5.0.0-SNAPSHOT'
1313
defaultVersionCode = 1
1414
webbridgeMinSdkVersion = 21
1515
samsungReferrerMinSdkVersion = 21

‎Adjust/example-app-java/src/main/java/com/adjust/examples/GlobalApplication.java‎

Lines changed: 3 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,17 @@
1919
import com.adjust.sdk.OnAmazonAdIdReadListener;
2020
import com.adjust.sdk.OnAttributionChangedListener;
2121
import com.adjust.sdk.OnAttributionReadListener;
22-
import com.adjust.sdk.OnDeeplinkResponseListener;
22+
import com.adjust.sdk.OnDeferredDeeplinkResponseListener;
2323
import com.adjust.sdk.OnEventTrackingFailedListener;
2424
import com.adjust.sdk.OnEventTrackingSucceededListener;
2525
import com.adjust.sdk.OnGooglePlayInstallReferrerReadListener;
2626
import com.adjust.sdk.OnSessionTrackingFailedListener;
2727
import com.adjust.sdk.OnSessionTrackingSucceededListener;
2828

29-
import java.util.ArrayList;
30-
import java.util.List;
31-
3229
/**
3330
* Created by pfms on 17/12/14.
3431
*/
3532
public class GlobalApplication extends Application {
36-
3733
@Override
3834
public void onCreate() {
3935
super.onCreate();
@@ -65,14 +61,6 @@ public void onFinishedEventTrackingSucceeded(AdjustEventSuccess eventSuccessResp
6561
}
6662
});
6763

68-
69-
// Set url strategy
70-
// List<String> urlStrategy = new ArrayList<>();
71-
// urlStrategy.add("adjust.com");
72-
// urlStrategy.add("adjust.cn");
73-
// urlStrategy.add("eu.adjust.com");
74-
// config.setUrlStrategy(urlStrategy , true, false);
75-
7664
// Set event failure tracking delegate.
7765
config.setOnEventTrackingFailedListener(new OnEventTrackingFailedListener() {
7866
@Override
@@ -101,7 +89,7 @@ public void onFinishedSessionTrackingFailed(AdjustSessionFailure sessionFailureR
10189
});
10290

10391
// Evaluate deferred deep link to be launched.
104-
config.setOnDeeplinkResponseListener(new OnDeeplinkResponseListener() {
92+
config.setOnDeferredDeeplinkResponseListener(new OnDeferredDeeplinkResponseListener() {
10593
@Override
10694
public boolean launchReceivedDeeplink(Uri deeplink) {
10795
Log.d("example", "Deferred deep link callback called!");
@@ -111,17 +99,8 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
11199
}
112100
});
113101

114-
// Set default tracker.
115-
// config.setDefaultTracker("{YourDefaultTracker}");
116-
117-
// Set process name.
118-
// config.setProcessName("com.adjust.examples");
119-
120102
// Allow to send in the background.
121-
config.setSendInBackground(true);
122-
123-
// Allow tracking preinstall
124-
// config.setPreinstallTrackingEnabled(true);
103+
config.enableSendingInBackground();
125104

126105
// Add session callback parameters.
127106
Adjust.addGlobalCallbackParameter("sc_foo", "sc_bar");
@@ -155,96 +134,5 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
155134

156135
// Initialise the adjust SDK.
157136
Adjust.initSdk(config);
158-
159-
160-
161-
162-
Adjust.getAttribution(new OnAttributionReadListener() {
163-
@Override
164-
public void onAttributionRead(AdjustAttribution attribution) {
165-
Log.d("example", "Attribution callback called!");
166-
Log.d("example", "Attribution: " + attribution.toString());
167-
}
168-
});
169-
170-
// Get the adid.
171-
Adjust.getAdid(new OnAdidReadListener() {
172-
@Override
173-
public void onAdidRead(String adid) {
174-
Log.d("example", "Adid callback called!");
175-
Log.d("example", "Adid: " + adid);
176-
}
177-
});
178-
179-
Adjust.getGooglePlayInstallReferrer(this, new OnGooglePlayInstallReferrerReadListener() {
180-
@Override
181-
public void onInstallReferrerRead(GooglePlayInstallReferrerDetails referrerDetails) {
182-
Log.d("example", "referrerApi : " + referrerDetails.toString());
183-
}
184-
185-
@Override
186-
public void onFailure(String message) {
187-
Log.d("example", "failed : " + message);
188-
189-
}
190-
});
191-
192-
// Register onResume and onPause events of all activities
193-
// for applications with minSdkVersion >= 14.
194-
registerActivityLifecycleCallbacks(new AdjustLifecycleCallbacks());
195-
196-
Adjust.getAmazonAdId(this, new OnAmazonAdIdReadListener() {
197-
@Override
198-
public void onAmazonAdIdRead(String amazonAdId) {
199-
Log.d("example", "amazonAdId : " + amazonAdId);
200-
}
201-
202-
@Override
203-
public void onFail(String message) {
204-
Log.d("example", "failed : " + message);
205-
}
206-
});
207-
208-
// Put the SDK in offline mode.
209-
// Adjust.switchToOfflineMode();
210-
211-
// Disable the SDK
212-
// Adjust.disable();
213-
214-
// Send push notification token.
215-
// Adjust.setPushToken("token");
216-
}
217-
218-
// You can use this class if your app is for Android 4.0 or higher
219-
private static final class AdjustLifecycleCallbacks implements ActivityLifecycleCallbacks {
220-
@Override
221-
public void onActivityResumed(Activity activity) {
222-
Adjust.onResume();
223-
}
224-
225-
@Override
226-
public void onActivityPaused(Activity activity) {
227-
Adjust.onPause();
228-
}
229-
230-
@Override
231-
public void onActivityStopped(Activity activity) {
232-
}
233-
234-
@Override
235-
public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
236-
}
237-
238-
@Override
239-
public void onActivityDestroyed(Activity activity) {
240-
}
241-
242-
@Override
243-
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
244-
}
245-
246-
@Override
247-
public void onActivityStarted(Activity activity) {
248-
}
249137
}
250138
}

‎Adjust/example-app-keyboard/src/main/java/com/adjust/examples/keyboard/GlobalApplication.java‎

Lines changed: 5 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
package com.adjust.examples.keyboard;
22

3-
import android.app.Activity;
43
import android.app.Application;
54
import android.net.Uri;
6-
import android.os.Bundle;
75
import android.util.Log;
86

97
import com.adjust.sdk.Adjust;
108
import com.adjust.sdk.AdjustAttribution;
119
import com.adjust.sdk.AdjustConfig;
1210
import com.adjust.sdk.AdjustEventFailure;
1311
import com.adjust.sdk.AdjustEventSuccess;
12+
import com.adjust.sdk.AdjustSessionFailure;
13+
import com.adjust.sdk.AdjustSessionSuccess;
1414
import com.adjust.sdk.LogLevel;
1515
import com.adjust.sdk.OnAttributionChangedListener;
16-
import com.adjust.sdk.OnDeeplinkResponseListener;
16+
import com.adjust.sdk.OnDeferredDeeplinkResponseListener;
1717
import com.adjust.sdk.OnEventTrackingFailedListener;
1818
import com.adjust.sdk.OnEventTrackingSucceededListener;
1919
import com.adjust.sdk.OnSessionTrackingFailedListener;
2020
import com.adjust.sdk.OnSessionTrackingSucceededListener;
21-
import com.adjust.sdk.AdjustSessionFailure;
22-
import com.adjust.sdk.AdjustSessionSuccess;
2321

2422
/**
2523
* Created by pfms on 17/12/14.
@@ -84,7 +82,7 @@ public void onFinishedSessionTrackingFailed(AdjustSessionFailure sessionFailureR
8482
});
8583

8684
// Evaluate deferred deep link to be launched.
87-
config.setOnDeeplinkResponseListener(new OnDeeplinkResponseListener() {
85+
config.setOnDeferredDeeplinkResponseListener(new OnDeferredDeeplinkResponseListener() {
8886
@Override
8987
public boolean launchReceivedDeeplink(Uri deeplink) {
9088
Log.d("example", "Deferred deep link callback called!");
@@ -101,7 +99,7 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
10199
// config.setProcessName("com.adjust.examples");
102100

103101
// Allow to send in the background.
104-
config.setSendInBackground(true);
102+
config.enableSendingInBackground();
105103

106104
// Add session callback parameters.
107105
Adjust.addGlobalCallbackParameter("sc_foo", "sc_bar");
@@ -136,10 +134,6 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
136134
// Initialise the adjust SDK.
137135
Adjust.initSdk(config);
138136

139-
// Register onResume and onPause events of all activities
140-
// for applications with minSdkVersion >= 14.
141-
registerActivityLifecycleCallbacks(new AdjustLifecycleCallbacks());
142-
143137
// Put the SDK in offline mode.
144138
// Adjust.switchToOfflineMode();
145139

@@ -149,37 +143,4 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
149143
// Send push notification token.
150144
// Adjust.setPushToken("token");
151145
}
152-
153-
// You can use this class if your app is for Android 4.0 or higher
154-
private static final class AdjustLifecycleCallbacks implements ActivityLifecycleCallbacks {
155-
@Override
156-
public void onActivityResumed(Activity activity) {
157-
Adjust.onResume();
158-
}
159-
160-
@Override
161-
public void onActivityPaused(Activity activity) {
162-
Adjust.onPause();
163-
}
164-
165-
@Override
166-
public void onActivityStopped(Activity activity) {
167-
}
168-
169-
@Override
170-
public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
171-
}
172-
173-
@Override
174-
public void onActivityDestroyed(Activity activity) {
175-
}
176-
177-
@Override
178-
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
179-
}
180-
181-
@Override
182-
public void onActivityStarted(Activity activity) {
183-
}
184-
}
185146
}

‎Adjust/example-app-kotlin/src/main/java/com/adjust/examples/GlobalApplication.kt‎

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.adjust.examples
22

3-
import android.app.Activity
43
import android.app.Application
5-
import android.os.Bundle
64
import android.util.Log
75
import com.adjust.sdk.Adjust
86
import com.adjust.sdk.AdjustConfig
@@ -52,25 +50,15 @@ class GlobalApplication : Application() {
5250
}
5351

5452
// Evaluate deferred deep link to be launched.
55-
config.setOnDeeplinkResponseListener { deeplink ->
53+
config.setOnDeferredDeeplinkResponseListener { deeplink ->
5654
Log.d("example", "Deferred deep link callback called!")
5755
Log.d("example", "Deep link URL: $deeplink")
5856

5957
true
6058
}
6159

62-
// Set default tracker.
63-
// config.setDefaultTracker("{YourDefaultTracker}");
64-
65-
// Set process name.
66-
// config.setProcessName("com.adjust.examples");
67-
6860
// Allow to send in the background.
69-
config.setSendInBackground(true)
70-
71-
72-
// Allow tracking preinstall
73-
// config.setPreinstallTrackingEnabled(true);
61+
config.enableSendingInBackground()
7462

7563
// Add session callback parameters.
7664
Adjust.addGlobalCallbackParameter("sc_foo", "sc_bar")
@@ -104,40 +92,5 @@ class GlobalApplication : Application() {
10492

10593
// Initialise the adjust SDK.
10694
Adjust.initSdk(config)
107-
108-
// Register onResume and onPause events of all activities
109-
// for applications with minSdkVersion >= 14.
110-
registerActivityLifecycleCallbacks(AdjustLifecycleCallbacks())
111-
112-
// Put the SDK in offline mode.
113-
// Adjust.switchToOfflineMode();
114-
115-
// Disable the SDK
116-
// Adjust.disable();
117-
118-
// Send push notification token.
119-
// Adjust.setPushToken("token");
120-
121-
}
122-
123-
// You can use this class if your app is for Android 4.0 or higher
124-
private class AdjustLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
125-
override fun onActivityResumed(activity: Activity) {
126-
Adjust.onResume()
127-
}
128-
129-
override fun onActivityPaused(activity: Activity) {
130-
Adjust.onPause()
131-
}
132-
133-
override fun onActivityStopped(activity: Activity) {}
134-
135-
override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
136-
137-
override fun onActivityDestroyed(activity: Activity) {}
138-
139-
override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
140-
141-
override fun onActivityStarted(activity: Activity) {}
14295
}
14396
}

0 commit comments

Comments
 (0)