Merge pull request #585 from adjust/v4370

Version 4.37.0
adjust · Nov 8, 2023 · 6c5b44f · 6c5b44f
2 parents eaaa504 + cfa428e
commit 6c5b44f
Show file tree

Hide file tree

Showing 23 changed files with 397 additions and 322 deletions.
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -9,7 +9,7 @@ ext {
     coreMinSdkVersion = 9
     coreCompileSdkVersion = 33
     coreTargetSdkVersion = 33
-    coreVersionName = '4.36.0'
+    coreVersionName = '4.37.0'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 17
     samsungReferrerMinSdkVersion = 18

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
@@ -34,7 +34,7 @@ private Adjust() {
      */
     public static synchronized AdjustInstance getDefaultInstance() {
         @SuppressWarnings("unused")
-        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.36.0";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.37.0";
 
         if (defaultInstance == null) {
             defaultInstance = new AdjustInstance();
@@ -327,7 +327,7 @@ public static void getGoogleAdId(Context context, OnDeviceIdsRead onDeviceIdRead
     public static String getAmazonAdId(final Context context) {
         Context appContext = extractApplicationContext(context);
         if (appContext != null) {
-            return Util.getFireAdvertisingId(appContext.getContentResolver());
+            return DeviceInfo.getFireAdvertisingIdBypassConditions(appContext.getContentResolver());
         }
 
         return null;

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java
@@ -46,13 +46,15 @@ public class AdjustConfig {
     boolean coppaCompliantEnabled;
     boolean finalAttributionEnabled;
     String fbAppId;
+    boolean readDeviceInfoOnceEnabled;
 
     public static final String ENVIRONMENT_SANDBOX = "sandbox";
     public static final String ENVIRONMENT_PRODUCTION = "production";
 
     public static final String URL_STRATEGY_INDIA = "url_strategy_india";
     public static final String URL_STRATEGY_CHINA = "url_strategy_china";
     public static final String URL_STRATEGY_CN = "url_strategy_cn";
+    public static final String URL_STRATEGY_CN_ONLY = "url_strategy_cn_only";
     public static final String DATA_RESIDENCY_EU = "data_residency_eu";
     public static final String DATA_RESIDENCY_TR = "data_residency_tr";
     public static final String DATA_RESIDENCY_US = "data_residency_us";
@@ -225,6 +227,7 @@ public void setUrlStrategy(String urlStrategy) {
         if (!urlStrategy.equals(URL_STRATEGY_INDIA)
                 && !urlStrategy.equals(URL_STRATEGY_CHINA)
                 && !urlStrategy.equals(URL_STRATEGY_CN)
+                && !urlStrategy.equals(URL_STRATEGY_CN_ONLY)
                 && !urlStrategy.equals(DATA_RESIDENCY_EU)
                 && !urlStrategy.equals(DATA_RESIDENCY_TR)
                 && !urlStrategy.equals(DATA_RESIDENCY_US))
@@ -234,6 +237,10 @@ public void setUrlStrategy(String urlStrategy) {
         this.urlStrategy = urlStrategy;
     }
 
+    public void setReadDeviceInfoOnceEnabled(boolean readDeviceInfoOnceEnabled) {
+        this.readDeviceInfoOnceEnabled = readDeviceInfoOnceEnabled;
+    }
+
     public String getBasePath() {
         return basePath;
     }
@@ -386,6 +393,10 @@ public String getFbAppId() {
         return fbAppId;
     }
 
+    public boolean isReadDeviceInfoOnceEnabled() {
+        return readDeviceInfoOnceEnabled;
+    }
+
     private void setLogLevel(LogLevel logLevel, String environment) {
         logger.setLogLevel(logLevel, AdjustConfig.ENVIRONMENT_PRODUCTION.equals(environment));
     }

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java
@@ -30,7 +30,7 @@ public interface Constants {
 
     String SCHEME = "https";
     String AUTHORITY = "app.adjust.com";
-    String CLIENT_SDK = "android4.36.0";
+    String CLIENT_SDK = "android4.37.0";
     String LOGTAG = "Adjust";
     String REFTAG = "reftag";
     String INSTALL_REFERRER = "install_referrer";