diff --git a/Adjust/build.gradle b/Adjust/build.gradle index c20ea5674..dc9464dc3 100644 --- a/Adjust/build.gradle +++ b/Adjust/build.gradle @@ -9,7 +9,7 @@ ext { coreMinSdkVersion = 9 coreCompileSdkVersion = 33 coreTargetSdkVersion = 33 - coreVersionName = '4.33.3' + coreVersionName = '4.33.4' 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 index 550d7803b..1962f06ca 100644 --- 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.33.3"; + String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.33.4"; if (defaultInstance == null) { defaultInstance = new AdjustInstance(); 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 index 419201eb1..9c80a789a 100644 --- a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java +++ b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java @@ -29,7 +29,7 @@ public interface Constants { String SCHEME = "https"; String AUTHORITY = "app.adjust.com"; - String CLIENT_SDK = "android4.33.3"; + String CLIENT_SDK = "android4.33.4"; String LOGTAG = "Adjust"; String REFTAG = "reftag"; String INSTALL_REFERRER = "install_referrer"; diff --git a/Adjust/sdk-plugin-criteo/build.gradle b/Adjust/sdk-plugin-criteo/build.gradle index 8db4f86c4..dcd12c056 100644 --- a/Adjust/sdk-plugin-criteo/build.gradle +++ b/Adjust/sdk-plugin-criteo/build.gradle @@ -23,7 +23,7 @@ dependencies { // Add SDK via module. compileOnly project(':sdk-core') // Add SDK via Maven. - // implementation 'com.adjust.sdk:adjust-android:4.33.3' + // implementation 'com.adjust.sdk:adjust-android:4.33.4' } // read local properties diff --git a/Adjust/sdk-plugin-imei/build.gradle b/Adjust/sdk-plugin-imei/build.gradle index 4d19446e0..4306e3e4b 100644 --- a/Adjust/sdk-plugin-imei/build.gradle +++ b/Adjust/sdk-plugin-imei/build.gradle @@ -22,7 +22,7 @@ dependencies { // Add SDK via module. compileOnly project(':sdk-core') // Add SDK via Maven. - // implementation 'com.adjust.sdk:adjust-android:4.33.3' + // implementation 'com.adjust.sdk:adjust-android:4.33.4' } // read local properties diff --git a/Adjust/sdk-plugin-imei/src/main/java/com/adjust/sdk/imei/TelephonyIdsUtil.java b/Adjust/sdk-plugin-imei/src/main/java/com/adjust/sdk/imei/TelephonyIdsUtil.java index af17d65e3..9b4fbfc20 100644 --- a/Adjust/sdk-plugin-imei/src/main/java/com/adjust/sdk/imei/TelephonyIdsUtil.java +++ b/Adjust/sdk-plugin-imei/src/main/java/com/adjust/sdk/imei/TelephonyIdsUtil.java @@ -20,6 +20,8 @@ class TelephonyIdsUtil { private static String meids = null; private static String deviceIds = null; + private static boolean allIdsAlreadyReadOnce = false; + static void injectImei(Map parameters, Context context, ILogger logger) { if (!AdjustImei.isImeiToBeRead) { return; @@ -32,6 +34,8 @@ static void injectImei(Map parameters, Context context, ILogger PackageBuilder.addString(parameters, "imeis", getImeis(telephonyManager, logger)); PackageBuilder.addString(parameters, "meids", getMeids(telephonyManager, logger)); PackageBuilder.addString(parameters, "device_ids", getDeviceIds(telephonyManager, logger)); + + allIdsAlreadyReadOnce = true; } private static String getDeviceIds(TelephonyManager telephonyManager, ILogger logger) { @@ -39,6 +43,10 @@ private static String getDeviceIds(TelephonyManager telephonyManager, ILogger lo return deviceIds; } + if (allIdsAlreadyReadOnce) { + return null; + } + List telephonyIdList = new ArrayList(); for (int i = 0; i < 10; i++) { String telephonyId = getDeviceIdByIndex(telephonyManager, i, logger); @@ -56,6 +64,10 @@ private static String getDefaultDeviceId(TelephonyManager telephonyManager, ILog return deviceId; } + if (allIdsAlreadyReadOnce) { + return null; + } + try { deviceId = telephonyManager.getDeviceId(); return deviceId; @@ -81,6 +93,10 @@ private static String getImeis(TelephonyManager telephonyManager, ILogger logger return imeis; } + if (allIdsAlreadyReadOnce) { + return null; + } + List imeiList = new ArrayList(); for (int i = 0; i < 10; i++) { String imei = getImeiByIndex(telephonyManager, i, logger); @@ -97,6 +113,10 @@ private static String getDefaultImei(TelephonyManager telephonyManager, ILogger return imei; } + if (allIdsAlreadyReadOnce) { + return null; + } + try { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { imei = telephonyManager.getImei(); @@ -124,6 +144,10 @@ public static String getMeids(TelephonyManager telephonyManager, ILogger logger) return meids; } + if (allIdsAlreadyReadOnce) { + return null; + } + List meidList = new ArrayList(); for (int i = 0; i < 10; i++) { String meid = getMeidByIndex(telephonyManager, i, logger); @@ -140,6 +164,10 @@ private static String getDefaultMeid(TelephonyManager telephonyManager, ILogger return meid; } + if (allIdsAlreadyReadOnce) { + return null; + } + try { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { meid = telephonyManager.getMeid(); diff --git a/Adjust/sdk-plugin-oaid/build.gradle b/Adjust/sdk-plugin-oaid/build.gradle index c0b1f66e6..0e126c6c2 100644 --- a/Adjust/sdk-plugin-oaid/build.gradle +++ b/Adjust/sdk-plugin-oaid/build.gradle @@ -25,7 +25,7 @@ dependencies { // Add SDK via module. compileOnly project(':sdk-core') // Add SDK via Maven. - // implementation 'com.adjust.sdk:adjust-android:4.33.3' + // implementation 'com.adjust.sdk:adjust-android:4.33.4' implementation 'com.huawei.hms:ads-identifier:3.4.56.300' } diff --git a/Adjust/sdk-plugin-samsung-referrer/build.gradle b/Adjust/sdk-plugin-samsung-referrer/build.gradle index 7f9bbeba1..87f5b1553 100644 --- a/Adjust/sdk-plugin-samsung-referrer/build.gradle +++ b/Adjust/sdk-plugin-samsung-referrer/build.gradle @@ -18,14 +18,13 @@ android { } dependencies { -// compileOnly files('libs/galaxyapps_sdk_referrer-release-v2.0.aar') - // Add SDK via module. compileOnly project(':sdk-core') // Add SDK via Maven. - // implementation 'com.adjust.sdk:adjust-android:4.33.3' + // implementation 'com.adjust.sdk:adjust-android:4.33.4' // Add Samsung referrer lib via Maven. + implementation 'store.galaxy.samsung.installreferrer:samsung_galaxystore_install_referrer:3.0.1' } // read local properties diff --git a/Adjust/sdk-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/SamsungReferrerClient.java b/Adjust/sdk-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/SamsungReferrerClient.java index 247d56b4c..3036df7b5 100644 --- a/Adjust/sdk-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/SamsungReferrerClient.java +++ b/Adjust/sdk-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/SamsungReferrerClient.java @@ -3,9 +3,9 @@ import android.content.Context; import com.adjust.sdk.ILogger; -import com.sec.android.app.samsungapps.installreferrer.api.InstallReferrerClient; -import com.sec.android.app.samsungapps.installreferrer.api.InstallReferrerStateListener; -import com.sec.android.app.samsungapps.installreferrer.api.ReferrerDetails; +import com.samsung.android.sdk.sinstallreferrer.api.InstallReferrerClient; +import com.samsung.android.sdk.sinstallreferrer.api.InstallReferrerStateListener; +import com.samsung.android.sdk.sinstallreferrer.api.ReferrerDetails; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/Adjust/sdk-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/Util.java b/Adjust/sdk-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/Util.java index b6618632b..28d292a9c 100644 --- a/Adjust/sdk-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/Util.java +++ b/Adjust/sdk-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/Util.java @@ -11,7 +11,7 @@ public synchronized static ReferrerDetails getSamsungInstallReferrerDetails(Cont return null; } - com.sec.android.app.samsungapps.installreferrer.api.ReferrerDetails referrerDetails = + com.samsung.android.sdk.sinstallreferrer.api.ReferrerDetails referrerDetails = SamsungReferrerClient.getReferrer(context, logger, 3000); if (referrerDetails == null) { return null; diff --git a/Adjust/sdk-plugin-sociomantic/build.gradle b/Adjust/sdk-plugin-sociomantic/build.gradle index ee1f1ffa2..36e3309e8 100644 --- a/Adjust/sdk-plugin-sociomantic/build.gradle +++ b/Adjust/sdk-plugin-sociomantic/build.gradle @@ -22,7 +22,7 @@ dependencies { // Add SDK via module. compileOnly project(':sdk-core') // Add SDK via Maven. - // implementation 'com.adjust.sdk:adjust-android:4.33.3' + // implementation 'com.adjust.sdk:adjust-android:4.33.4' } // read local properties diff --git a/Adjust/sdk-plugin-trademob/build.gradle b/Adjust/sdk-plugin-trademob/build.gradle index 523d911e5..cb064f08d 100644 --- a/Adjust/sdk-plugin-trademob/build.gradle +++ b/Adjust/sdk-plugin-trademob/build.gradle @@ -22,7 +22,7 @@ dependencies { // Add SDK via module. compileOnly project(':sdk-core') // Add SDK via Maven. - // implementation 'com.adjust.sdk:adjust-android:4.33.3' + // implementation 'com.adjust.sdk:adjust-android:4.33.4' } // read local properties diff --git a/Adjust/sdk-plugin-vivo-referrer/build.gradle b/Adjust/sdk-plugin-vivo-referrer/build.gradle index e7da4e87d..f19fe65f0 100644 --- a/Adjust/sdk-plugin-vivo-referrer/build.gradle +++ b/Adjust/sdk-plugin-vivo-referrer/build.gradle @@ -23,7 +23,7 @@ dependencies { // Add SDK via module. compileOnly project(':sdk-core') // Add SDK via Maven. - // implementation 'com.adjust.sdk:adjust-android:4.33.3' + // implementation 'com.adjust.sdk:adjust-android:4.33.4' } // read local properties diff --git a/Adjust/sdk-plugin-webbridge/build.gradle b/Adjust/sdk-plugin-webbridge/build.gradle index d9224cad5..0249afa89 100644 --- a/Adjust/sdk-plugin-webbridge/build.gradle +++ b/Adjust/sdk-plugin-webbridge/build.gradle @@ -22,7 +22,7 @@ dependencies { // Add SDK via module. compileOnly project(':sdk-core') // Add SDK via Maven. - // implementation 'com.adjust.sdk:adjust-android:4.33.3' + // implementation 'com.adjust.sdk:adjust-android:4.33.4' } // read local properties diff --git a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js index 17cc50b53..b969cc14d 100644 --- a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js +++ b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js @@ -211,7 +211,7 @@ var Adjust = { if (this.adjustConfig) { return this.adjustConfig.getSdkPrefix(); } else { - return 'web-bridge4.33.3'; + return 'web-bridge4.33.4'; } }, diff --git a/Adjust/sdk-plugin-xiaomi-referrer/build.gradle b/Adjust/sdk-plugin-xiaomi-referrer/build.gradle index 0fa917bc8..c6ee0bc7e 100644 --- a/Adjust/sdk-plugin-xiaomi-referrer/build.gradle +++ b/Adjust/sdk-plugin-xiaomi-referrer/build.gradle @@ -23,7 +23,7 @@ dependencies { // Add SDK via module. compileOnly project(':sdk-core') // Add SDK via Maven. - // implementation 'com.adjust.sdk:adjust-android:4.33.3' + // implementation 'com.adjust.sdk:adjust-android:4.33.4' // Add xiaomi referrer lib via Maven. implementation 'com.miui.referrer:homereferrer:1.0.0.6' diff --git a/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java b/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java index 7af9d2a9a..5ba9a3a37 100644 --- a/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java +++ b/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java @@ -53,7 +53,7 @@ public TestActivityPackage(ActivityPackage activityPackage) { // default values appToken = "123456789012"; environment = "sandbox"; - clientSdk = "android4.33.3"; + clientSdk = "android4.33.4"; suffix = ""; attribution = new AdjustAttribution(); playServices = true; diff --git a/CHANGELOG.md b/CHANGELOG.md index 28a2d7068..400de1dc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +### Version 4.33.4 (27th April 2023) +#### Changed +- Updated Samsung Install Referrer library version to 3.0.1. +- Updated IMEI reading attempt to only once. + +--- + ### Version 4.33.3 (16th February 2023) #### Fixed - Added catching of exceptions in referrer plugins when thrown anytime while retrieving referrer. diff --git a/VERSION b/VERSION index 51e0a420d..42e44f83e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.33.3 +4.33.4