Skip to content

Commit f720f67

Browse files
shashanksushashanksu
authored
Merge pull request #573 from adjust/v4334
Version 4.33.4
2 parents 43b88df + 6d82408 commit f720f67

File tree

19 files changed

+55
-21
lines changed

19 files changed

+55
-21
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.33.3'
12+
coreVersionName = '4.33.4'
1313
defaultVersionCode = 1
1414
webbridgeMinSdkVersion = 17
1515
samsungReferrerMinSdkVersion = 18

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

Lines changed: 1 addition & 1 deletion
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.33.3";
37+
String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.33.4";
3838

3939
if (defaultInstance == null) {
4040
defaultInstance = new AdjustInstance();

‎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
@@ -29,7 +29,7 @@ public interface Constants {
2929

3030
String SCHEME = "https";
3131
String AUTHORITY = "app.adjust.com";
32-
String CLIENT_SDK = "android4.33.3";
32+
String CLIENT_SDK = "android4.33.4";
3333
String LOGTAG = "Adjust";
3434
String REFTAG = "reftag";
3535
String INSTALL_REFERRER = "install_referrer";

‎Adjust/sdk-plugin-criteo/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
// Add SDK via module.
2424
compileOnly project(':sdk-core')
2525
// Add SDK via Maven.
26-
// implementation 'com.adjust.sdk:adjust-android:4.33.3'
26+
// implementation 'com.adjust.sdk:adjust-android:4.33.4'
2727
}
2828

2929
// read local properties

‎Adjust/sdk-plugin-imei/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
// Add SDK via module.
2323
compileOnly project(':sdk-core')
2424
// Add SDK via Maven.
25-
// implementation 'com.adjust.sdk:adjust-android:4.33.3'
25+
// implementation 'com.adjust.sdk:adjust-android:4.33.4'
2626
}
2727

2828
// read local properties

‎Adjust/sdk-plugin-imei/src/main/java/com/adjust/sdk/imei/TelephonyIdsUtil.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ class TelephonyIdsUtil {
2020
private static String meids = null;
2121
private static String deviceIds = null;
2222

23+
private static boolean allIdsAlreadyReadOnce = false;
24+
2325
static void injectImei(Map<String, String> parameters, Context context, ILogger logger) {
2426
if (!AdjustImei.isImeiToBeRead) {
2527
return;
@@ -32,13 +34,19 @@ static void injectImei(Map<String, String> parameters, Context context, ILogger
3234
PackageBuilder.addString(parameters, "imeis", getImeis(telephonyManager, logger));
3335
PackageBuilder.addString(parameters, "meids", getMeids(telephonyManager, logger));
3436
PackageBuilder.addString(parameters, "device_ids", getDeviceIds(telephonyManager, logger));
37+
38+
allIdsAlreadyReadOnce = true;
3539
}
3640

3741
private static String getDeviceIds(TelephonyManager telephonyManager, ILogger logger) {
3842
if (deviceIds != null) {
3943
return deviceIds;
4044
}
4145

46+
if (allIdsAlreadyReadOnce) {
47+
return null;
48+
}
49+
4250
List<String> telephonyIdList = new ArrayList<String>();
4351
for (int i = 0; i < 10; i++) {
4452
String telephonyId = getDeviceIdByIndex(telephonyManager, i, logger);
@@ -56,6 +64,10 @@ private static String getDefaultDeviceId(TelephonyManager telephonyManager, ILog
5664
return deviceId;
5765
}
5866

67+
if (allIdsAlreadyReadOnce) {
68+
return null;
69+
}
70+
5971
try {
6072
deviceId = telephonyManager.getDeviceId();
6173
return deviceId;
@@ -81,6 +93,10 @@ private static String getImeis(TelephonyManager telephonyManager, ILogger logger
8193
return imeis;
8294
}
8395

96+
if (allIdsAlreadyReadOnce) {
97+
return null;
98+
}
99+
84100
List<String> imeiList = new ArrayList<String>();
85101
for (int i = 0; i < 10; i++) {
86102
String imei = getImeiByIndex(telephonyManager, i, logger);
@@ -97,6 +113,10 @@ private static String getDefaultImei(TelephonyManager telephonyManager, ILogger
97113
return imei;
98114
}
99115

116+
if (allIdsAlreadyReadOnce) {
117+
return null;
118+
}
119+
100120
try {
101121
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
102122
imei = telephonyManager.getImei();
@@ -124,6 +144,10 @@ public static String getMeids(TelephonyManager telephonyManager, ILogger logger)
124144
return meids;
125145
}
126146

147+
if (allIdsAlreadyReadOnce) {
148+
return null;
149+
}
150+
127151
List<String> meidList = new ArrayList<String>();
128152
for (int i = 0; i < 10; i++) {
129153
String meid = getMeidByIndex(telephonyManager, i, logger);
@@ -140,6 +164,10 @@ private static String getDefaultMeid(TelephonyManager telephonyManager, ILogger
140164
return meid;
141165
}
142166

167+
if (allIdsAlreadyReadOnce) {
168+
return null;
169+
}
170+
143171
try {
144172
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
145173
meid = telephonyManager.getMeid();

‎Adjust/sdk-plugin-oaid/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
// Add SDK via module.
2626
compileOnly project(':sdk-core')
2727
// Add SDK via Maven.
28-
// implementation 'com.adjust.sdk:adjust-android:4.33.3'
28+
// implementation 'com.adjust.sdk:adjust-android:4.33.4'
2929
implementation 'com.huawei.hms:ads-identifier:3.4.56.300'
3030
}
3131

‎Adjust/sdk-plugin-samsung-referrer/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@ android {
1818
}
1919

2020
dependencies {
21-
// compileOnly files('libs/galaxyapps_sdk_referrer-release-v2.0.aar')
22-
2321
// Add SDK via module.
2422
compileOnly project(':sdk-core')
2523
// Add SDK via Maven.
26-
// implementation 'com.adjust.sdk:adjust-android:4.33.3'
24+
// implementation 'com.adjust.sdk:adjust-android:4.33.4'
2725

2826
// Add Samsung referrer lib via Maven.
27+
implementation 'store.galaxy.samsung.installreferrer:samsung_galaxystore_install_referrer:3.0.1'
2928
}
3029

3130
// read local properties

‎Adjust/sdk-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/SamsungReferrerClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.content.Context;
44

55
import com.adjust.sdk.ILogger;
6-
import com.sec.android.app.samsungapps.installreferrer.api.InstallReferrerClient;
7-
import com.sec.android.app.samsungapps.installreferrer.api.InstallReferrerStateListener;
8-
import com.sec.android.app.samsungapps.installreferrer.api.ReferrerDetails;
6+
import com.samsung.android.sdk.sinstallreferrer.api.InstallReferrerClient;
7+
import com.samsung.android.sdk.sinstallreferrer.api.InstallReferrerStateListener;
8+
import com.samsung.android.sdk.sinstallreferrer.api.ReferrerDetails;
99

1010
import java.util.concurrent.BlockingQueue;
1111
import java.util.concurrent.LinkedBlockingQueue;

‎Adjust/sdk-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/Util.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public synchronized static ReferrerDetails getSamsungInstallReferrerDetails(Cont
1111
return null;
1212
}
1313

14-
com.sec.android.app.samsungapps.installreferrer.api.ReferrerDetails referrerDetails =
14+
com.samsung.android.sdk.sinstallreferrer.api.ReferrerDetails referrerDetails =
1515
SamsungReferrerClient.getReferrer(context, logger, 3000);
1616
if (referrerDetails == null) {
1717
return null;

0 commit comments

Comments
 (0)