Skip to content

Commit eafa4e8

Browse files
shashanksushashanksu
authored
Merge pull request #563 from adjust/v4332
Version 4.33.2
2 parents 63ea444 + 027443a commit eafa4e8

File tree

21 files changed

+97
-91
lines changed

21 files changed

+97
-91
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.1'
12+
coreVersionName = '4.33.2'
1313
defaultVersionCode = 1
1414
webbridgeMinSdkVersion = 17
1515
samsungReferrerMinSdkVersion = 18

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,13 @@ public boolean equals(Object other) {
242242
public int hashCode() {
243243
if (hashCode == 0) {
244244
hashCode = 17;
245-
hashCode = 37 * hashCode + Util.hashString(path);
246-
hashCode = 37 * hashCode + Util.hashString(clientSdk);
247-
hashCode = 37 * hashCode + Util.hashObject(parameters);
248-
hashCode = 37 * hashCode + Util.hashEnum(activityKind);
249-
hashCode = 37 * hashCode + Util.hashString(suffix);
250-
hashCode = 37 * hashCode + Util.hashObject(callbackParameters);
251-
hashCode = 37 * hashCode + Util.hashObject(partnerParameters);
245+
hashCode = Util.hashString(path, hashCode);
246+
hashCode = Util.hashString(clientSdk, hashCode);
247+
hashCode = Util.hashObject(parameters, hashCode);
248+
hashCode = Util.hashEnum(activityKind, hashCode);
249+
hashCode = Util.hashString(suffix, hashCode);
250+
hashCode = Util.hashObject(callbackParameters, hashCode);
251+
hashCode = Util.hashObject(partnerParameters, hashCode);
252252
}
253253
return hashCode;
254254
}

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -255,46 +255,46 @@ public boolean equals(Object other) {
255255
@Override
256256
public int hashCode() {
257257
int hashCode = 17;
258-
hashCode = 37 * hashCode + Util.hashString(uuid);
259-
hashCode = 37 * hashCode + Util.hashBoolean(enabled);
260-
hashCode = 37 * hashCode + Util.hashBoolean(isGdprForgotten);
261-
hashCode = 37 * hashCode + Util.hashBoolean(isThirdPartySharingDisabled);
262-
hashCode = 37 * hashCode + Util.hashBoolean(isThirdPartySharingDisabledForCoppa);
263-
hashCode = 37 * hashCode + Util.hashBoolean(askingAttribution);
258+
hashCode = Util.hashString(uuid, hashCode);
259+
hashCode = Util.hashBoolean(enabled, hashCode);
260+
hashCode = Util.hashBoolean(isGdprForgotten, hashCode);
261+
hashCode = Util.hashBoolean(isThirdPartySharingDisabled, hashCode);
262+
hashCode = Util.hashBoolean(isThirdPartySharingDisabledForCoppa, hashCode);
263+
hashCode = Util.hashBoolean(askingAttribution, hashCode);
264264
hashCode = 37 * hashCode + eventCount;
265265
hashCode = 37 * hashCode + sessionCount;
266266
hashCode = 37 * hashCode + subsessionCount;
267-
hashCode = 37 * hashCode + Util.hashLong(sessionLength);
268-
hashCode = 37 * hashCode + Util.hashLong(timeSpent);
269-
hashCode = 37 * hashCode + Util.hashLong(lastInterval);
270-
hashCode = 37 * hashCode + Util.hashBoolean(updatePackages);
271-
hashCode = 37 * hashCode + Util.hashObject(orderIds);
272-
hashCode = 37 * hashCode + Util.hashString(pushToken);
273-
hashCode = 37 * hashCode + Util.hashString(adid);
274-
hashCode = 37 * hashCode + Util.hashLong(clickTime);
275-
hashCode = 37 * hashCode + Util.hashLong(installBegin);
276-
hashCode = 37 * hashCode + Util.hashString(installReferrer);
277-
hashCode = 37 * hashCode + Util.hashBoolean(googlePlayInstant);
278-
hashCode = 37 * hashCode + Util.hashLong(clickTimeServer);
279-
hashCode = 37 * hashCode + Util.hashLong(installBeginServer);
280-
hashCode = 37 * hashCode + Util.hashString(installVersion);
281-
hashCode = 37 * hashCode + Util.hashLong(clickTimeHuawei);
282-
hashCode = 37 * hashCode + Util.hashLong(installBeginHuawei);
283-
hashCode = 37 * hashCode + Util.hashString(installReferrerHuawei);
284-
hashCode = 37 * hashCode + Util.hashString(installReferrerHuaweiAppGallery);
285-
hashCode = 37 * hashCode + Util.hashLong(clickTimeXiaomi);
286-
hashCode = 37 * hashCode + Util.hashLong(installBeginXiaomi);
287-
hashCode = 37 * hashCode + Util.hashString(installReferrerXiaomi);
288-
hashCode = 37 * hashCode + Util.hashLong(clickTimeServerXiaomi);
289-
hashCode = 37 * hashCode + Util.hashLong(installBeginServerXiaomi);
290-
hashCode = 37 * hashCode + Util.hashString(installVersionXiaomi);
291-
hashCode = 37 * hashCode + Util.hashLong(clickTimeSamsung);
292-
hashCode = 37 * hashCode + Util.hashLong(installBeginSamsung);
293-
hashCode = 37 * hashCode + Util.hashString(installReferrerSamsung);
294-
hashCode = 37 * hashCode + Util.hashLong(clickTimeVivo);
295-
hashCode = 37 * hashCode + Util.hashLong(installBeginVivo);
296-
hashCode = 37 * hashCode + Util.hashString(installReferrerVivo);
297-
hashCode = 37 * hashCode + Util.hashString(installVersionVivo);
267+
hashCode = Util.hashLong(sessionLength, hashCode);
268+
hashCode = Util.hashLong(timeSpent, hashCode);
269+
hashCode = Util.hashLong(lastInterval, hashCode);
270+
hashCode = Util.hashBoolean(updatePackages, hashCode);
271+
hashCode = Util.hashObject(orderIds, hashCode);
272+
hashCode = Util.hashString(pushToken, hashCode);
273+
hashCode = Util.hashString(adid, hashCode);
274+
hashCode = Util.hashLong(clickTime, hashCode);
275+
hashCode = Util.hashLong(installBegin, hashCode);
276+
hashCode = Util.hashString(installReferrer, hashCode);
277+
hashCode = Util.hashBoolean(googlePlayInstant, hashCode);
278+
hashCode = Util.hashLong(clickTimeServer, hashCode);
279+
hashCode = Util.hashLong(installBeginServer, hashCode);
280+
hashCode = Util.hashString(installVersion, hashCode);
281+
hashCode = Util.hashLong(clickTimeHuawei, hashCode);
282+
hashCode = Util.hashLong(installBeginHuawei, hashCode);
283+
hashCode = Util.hashString(installReferrerHuawei, hashCode);
284+
hashCode = Util.hashString(installReferrerHuaweiAppGallery, hashCode);
285+
hashCode = Util.hashLong(clickTimeXiaomi, hashCode);
286+
hashCode = Util.hashLong(installBeginXiaomi, hashCode);
287+
hashCode = Util.hashString(installReferrerXiaomi, hashCode);
288+
hashCode = Util.hashLong(clickTimeServerXiaomi, hashCode);
289+
hashCode = Util.hashLong(installBeginServerXiaomi, hashCode);
290+
hashCode = Util.hashString(installVersionXiaomi, hashCode);
291+
hashCode = Util.hashLong(clickTimeSamsung, hashCode);
292+
hashCode = Util.hashLong(installBeginSamsung, hashCode);
293+
hashCode = Util.hashString(installReferrerSamsung, hashCode);
294+
hashCode = Util.hashLong(clickTimeVivo, hashCode);
295+
hashCode = Util.hashLong(installBeginVivo, hashCode);
296+
hashCode = Util.hashString(installReferrerVivo, hashCode);
297+
hashCode = Util.hashString(installVersionVivo, hashCode);
298298
return hashCode;
299299
}
300300

‎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.1";
37+
String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.33.2";
3838

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

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,18 @@ public boolean equals(Object other) {
105105
@Override
106106
public int hashCode() {
107107
int hashCode = 17;
108-
hashCode = 37 * hashCode + Util.hashString(trackerToken);
109-
hashCode = 37 * hashCode + Util.hashString(trackerName);
110-
hashCode = 37 * hashCode + Util.hashString(network);
111-
hashCode = 37 * hashCode + Util.hashString(campaign);
112-
hashCode = 37 * hashCode + Util.hashString(adgroup);
113-
hashCode = 37 * hashCode + Util.hashString(creative);
114-
hashCode = 37 * hashCode + Util.hashString(clickLabel);
115-
hashCode = 37 * hashCode + Util.hashString(adid);
116-
hashCode = 37 * hashCode + Util.hashString(costType);
117-
hashCode = 37 * hashCode + Util.hashDouble(costAmount);
118-
hashCode = 37 * hashCode + Util.hashString(costCurrency);
119-
hashCode = 37 * hashCode + Util.hashString(fbInstallReferrer);
108+
hashCode = Util.hashString(trackerToken, hashCode);
109+
hashCode = Util.hashString(trackerName, hashCode);
110+
hashCode = Util.hashString(network, hashCode);
111+
hashCode = Util.hashString(campaign, hashCode);
112+
hashCode = Util.hashString(adgroup, hashCode);
113+
hashCode = Util.hashString(creative, hashCode);
114+
hashCode = Util.hashString(clickLabel, hashCode);
115+
hashCode = Util.hashString(adid, hashCode);
116+
hashCode = Util.hashString(costType, hashCode);
117+
hashCode = Util.hashDouble(costAmount, hashCode);
118+
hashCode = Util.hashString(costCurrency, hashCode);
119+
hashCode = Util.hashString(fbInstallReferrer, hashCode);
120120

121121
return hashCode;
122122
}

‎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.1";
32+
String CLIENT_SDK = "android4.33.2";
3333
String LOGTAG = "Adjust";
3434
String REFTAG = "reftag";
3535
String INSTALL_REFERRER = "install_referrer";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public boolean equals(Object other) {
2626
@Override
2727
public int hashCode() {
2828
int hashCode = 17;
29-
hashCode = 37 * hashCode + Util.hashObject(callbackParameters);
30-
hashCode = 37 * hashCode + Util.hashObject(partnerParameters);
29+
hashCode = Util.hashObject(callbackParameters, hashCode);
30+
hashCode = Util.hashObject(partnerParameters, hashCode);
3131
return hashCode;
3232
}
3333

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -359,46 +359,46 @@ public static boolean equalBoolean(Boolean first, Boolean second) {
359359
return equalObject(first, second);
360360
}
361361

362-
public static int hashBoolean(Boolean value) {
362+
public static int hashBoolean(Boolean value, int hashCode) {
363363
if (value == null) {
364-
return 0;
364+
return 37 * hashCode;
365365
}
366-
return value.hashCode();
366+
return 37 * hashCode + value.hashCode();
367367
}
368368

369-
public static int hashLong(Long value) {
369+
public static int hashLong(Long value, int hashCode) {
370370
if (value == null) {
371-
return 0;
371+
return 37 * hashCode;
372372
}
373-
return value.hashCode();
373+
return 37 * hashCode + value.hashCode();
374374
}
375375

376-
public static int hashDouble(Double value) {
376+
public static int hashDouble(Double value, int hashCode) {
377377
if (value == null) {
378-
return 0;
378+
return 37 * hashCode;
379379
}
380-
return value.hashCode();
380+
return 37 * hashCode + value.hashCode();
381381
}
382382

383-
public static int hashString(String value) {
383+
public static int hashString(String value, int hashCode) {
384384
if (value == null) {
385-
return 0;
385+
return 37 * hashCode;
386386
}
387-
return value.hashCode();
387+
return 37 * hashCode + value.hashCode();
388388
}
389389

390-
public static int hashEnum(Enum value) {
390+
public static int hashEnum(Enum value, int hashCode) {
391391
if (value == null) {
392-
return 0;
392+
return 37 * hashCode;
393393
}
394-
return value.hashCode();
394+
return 37 * hashCode + value.hashCode();
395395
}
396396

397-
public static int hashObject(Object value) {
397+
public static int hashObject(Object value, int hashCode) {
398398
if (value == null) {
399-
return 0;
399+
return 37 * hashCode;
400400
}
401-
return value.hashCode();
401+
return 37 * hashCode + value.hashCode();
402402
}
403403

404404
public static String sha256(final String text) {

‎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.1'
26+
// implementation 'com.adjust.sdk:adjust-android:4.33.2'
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.1'
25+
// implementation 'com.adjust.sdk:adjust-android:4.33.2'
2626
}
2727

2828
// read local properties

0 commit comments

Comments
 (0)