Skip to content

Commit 6c5b44f

Browse files
authored
Merge pull request #585 from adjust/v4370
Version 4.37.0
2 parents eaaa504 + cfa428e commit 6c5b44f

File tree

23 files changed

+397
-322
lines changed

23 files changed

+397
-322
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 = 9
1010
coreCompileSdkVersion = 33
1111
coreTargetSdkVersion = 33
12-
coreVersionName = '4.36.0'
12+
coreVersionName = '4.37.0'
1313
defaultVersionCode = 1
1414
webbridgeMinSdkVersion = 17
1515
samsungReferrerMinSdkVersion = 18

Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private Adjust() {
3434
*/
3535
public static synchronized AdjustInstance getDefaultInstance() {
3636
@SuppressWarnings("unused")
37-
String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.36.0";
37+
String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.37.0";
3838

3939
if (defaultInstance == null) {
4040
defaultInstance = new AdjustInstance();
@@ -327,7 +327,7 @@ public static void getGoogleAdId(Context context, OnDeviceIdsRead onDeviceIdRead
327327
public static String getAmazonAdId(final Context context) {
328328
Context appContext = extractApplicationContext(context);
329329
if (appContext != null) {
330-
return Util.getFireAdvertisingId(appContext.getContentResolver());
330+
return DeviceInfo.getFireAdvertisingIdBypassConditions(appContext.getContentResolver());
331331
}
332332

333333
return null;

Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,15 @@ public class AdjustConfig {
4646
boolean coppaCompliantEnabled;
4747
boolean finalAttributionEnabled;
4848
String fbAppId;
49+
boolean readDeviceInfoOnceEnabled;
4950

5051
public static final String ENVIRONMENT_SANDBOX = "sandbox";
5152
public static final String ENVIRONMENT_PRODUCTION = "production";
5253

5354
public static final String URL_STRATEGY_INDIA = "url_strategy_india";
5455
public static final String URL_STRATEGY_CHINA = "url_strategy_china";
5556
public static final String URL_STRATEGY_CN = "url_strategy_cn";
57+
public static final String URL_STRATEGY_CN_ONLY = "url_strategy_cn_only";
5658
public static final String DATA_RESIDENCY_EU = "data_residency_eu";
5759
public static final String DATA_RESIDENCY_TR = "data_residency_tr";
5860
public static final String DATA_RESIDENCY_US = "data_residency_us";
@@ -225,6 +227,7 @@ public void setUrlStrategy(String urlStrategy) {
225227
if (!urlStrategy.equals(URL_STRATEGY_INDIA)
226228
&& !urlStrategy.equals(URL_STRATEGY_CHINA)
227229
&& !urlStrategy.equals(URL_STRATEGY_CN)
230+
&& !urlStrategy.equals(URL_STRATEGY_CN_ONLY)
228231
&& !urlStrategy.equals(DATA_RESIDENCY_EU)
229232
&& !urlStrategy.equals(DATA_RESIDENCY_TR)
230233
&& !urlStrategy.equals(DATA_RESIDENCY_US))
@@ -234,6 +237,10 @@ public void setUrlStrategy(String urlStrategy) {
234237
this.urlStrategy = urlStrategy;
235238
}
236239

240+
public void setReadDeviceInfoOnceEnabled(boolean readDeviceInfoOnceEnabled) {
241+
this.readDeviceInfoOnceEnabled = readDeviceInfoOnceEnabled;
242+
}
243+
237244
public String getBasePath() {
238245
return basePath;
239246
}
@@ -386,6 +393,10 @@ public String getFbAppId() {
386393
return fbAppId;
387394
}
388395

396+
public boolean isReadDeviceInfoOnceEnabled() {
397+
return readDeviceInfoOnceEnabled;
398+
}
399+
389400
private void setLogLevel(LogLevel logLevel, String environment) {
390401
logger.setLogLevel(logLevel, AdjustConfig.ENVIRONMENT_PRODUCTION.equals(environment));
391402
}

Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public interface Constants {
3030

3131
String SCHEME = "https";
3232
String AUTHORITY = "app.adjust.com";
33-
String CLIENT_SDK = "android4.36.0";
33+
String CLIENT_SDK = "android4.37.0";
3434
String LOGTAG = "Adjust";
3535
String REFTAG = "reftag";
3636
String INSTALL_REFERRER = "install_referrer";

0 commit comments

Comments
 (0)