Skip to content

Commit e4222a8

Browse files
shashanksushashanksu
authored
Merge pull request #595 from adjust/v4382
Version 4.38.2
2 parents 57f4684 + 1b79497 commit e4222a8

File tree

20 files changed

+66
-77
lines changed

20 files changed

+66
-77
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 = 34
1111
coreTargetSdkVersion = 34
12-
coreVersionName = '4.38.1'
12+
coreVersionName = '4.38.2'
1313
defaultVersionCode = 1
1414
webbridgeMinSdkVersion = 17
1515
samsungReferrerMinSdkVersion = 18

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

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -901,24 +901,6 @@ public void run(ActivityHandler activityHandler) {
901901
SharedPreferencesManager sharedPreferencesManager = SharedPreferencesManager.getDefaultInstance(getContext());
902902
if (sharedPreferencesManager.getGdprForgetMe()) {
903903
gdprForgetMe();
904-
} else {
905-
if (sharedPreferencesManager.getDisableThirdPartySharing()) {
906-
disableThirdPartySharing();
907-
}
908-
for (AdjustThirdPartySharing adjustThirdPartySharing :
909-
adjustConfig.preLaunchActions.preLaunchAdjustThirdPartySharingArray)
910-
{
911-
trackThirdPartySharing(adjustThirdPartySharing);
912-
}
913-
if (adjustConfig.preLaunchActions.lastMeasurementConsentTracked != null) {
914-
trackMeasurementConsent(
915-
adjustConfig.preLaunchActions.
916-
lastMeasurementConsentTracked.booleanValue());
917-
}
918-
919-
adjustConfig.preLaunchActions.preLaunchAdjustThirdPartySharingArray =
920-
new ArrayList<>();
921-
adjustConfig.preLaunchActions.lastMeasurementConsentTracked = null;
922904
}
923905
}
924906

@@ -966,7 +948,8 @@ public void run() {
966948
adjustConfig.gdprPath,
967949
adjustConfig.subscriptionPath,
968950
adjustConfig.purchaseVerificationPath,
969-
deviceInfo.clientSdk);
951+
deviceInfo.clientSdk,
952+
adjustConfig.context);
970953
packageHandler = AdjustFactory.getPackageHandler(
971954
this,
972955
adjustConfig.context,
@@ -980,7 +963,8 @@ public void run() {
980963
adjustConfig.gdprPath,
981964
adjustConfig.subscriptionPath,
982965
adjustConfig.purchaseVerificationPath,
983-
deviceInfo.clientSdk);
966+
deviceInfo.clientSdk,
967+
adjustConfig.context);
984968

985969
attributionHandler = AdjustFactory.getAttributionHandler(
986970
this,
@@ -994,7 +978,8 @@ public void run() {
994978
adjustConfig.gdprPath,
995979
adjustConfig.subscriptionPath,
996980
adjustConfig.purchaseVerificationPath,
997-
deviceInfo.clientSdk);
981+
deviceInfo.clientSdk,
982+
adjustConfig.context);
998983

999984
sdkClickHandler = AdjustFactory.getSdkClickHandler(
1000985
this,
@@ -1008,7 +993,8 @@ public void run() {
1008993
adjustConfig.gdprPath,
1009994
adjustConfig.subscriptionPath,
1010995
adjustConfig.purchaseVerificationPath,
1011-
deviceInfo.clientSdk);
996+
deviceInfo.clientSdk,
997+
adjustConfig.context);
1012998

1013999
purchaseVerificationHandler = AdjustFactory.getPurchaseVerificationHandler(
10141000
this,
@@ -1218,6 +1204,27 @@ private void startI() {
12181204
AdjustSigner.onResume(adjustConfig.logger);
12191205
startFirstSessionI();
12201206
return;
1207+
} else {
1208+
SharedPreferencesManager sharedPreferencesManager = SharedPreferencesManager.getDefaultInstance(getContext());
1209+
1210+
// check if disable third party sharing request came, then send it first
1211+
if (sharedPreferencesManager.getDisableThirdPartySharing()) {
1212+
disableThirdPartySharingI();
1213+
}
1214+
for (AdjustThirdPartySharing adjustThirdPartySharing :
1215+
adjustConfig.preLaunchActions.preLaunchAdjustThirdPartySharingArray)
1216+
{
1217+
trackThirdPartySharingI(adjustThirdPartySharing);
1218+
}
1219+
if (adjustConfig.preLaunchActions.lastMeasurementConsentTracked != null) {
1220+
trackMeasurementConsentI(
1221+
adjustConfig.preLaunchActions.
1222+
lastMeasurementConsentTracked.booleanValue());
1223+
}
1224+
1225+
adjustConfig.preLaunchActions.preLaunchAdjustThirdPartySharingArray =
1226+
new ArrayList<>();
1227+
adjustConfig.preLaunchActions.lastMeasurementConsentTracked = null;
12211228
}
12221229

12231230
// it shouldn't start if it was disabled after a first session

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

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public static void sign(Map<String, String> parameters, String activityKind, Str
6363
}
6464

6565
try {
66+
logger.debug("Signing all the parameters");
6667
Reflection.invokeInstanceMethod(signerInstance, "sign",
6768
new Class[]{Context.class, Map.class, String.class, String.class},
6869
context, parameters, activityKind, clientSdk);

‎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.38.1";
33+
String CLIENT_SDK = "android4.38.2";
3434
String LOGTAG = "Adjust";
3535
String REFTAG = "reftag";
3636
String INSTALL_REFERRER = "install_referrer";

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

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ ActivityPackage buildSessionPackage(boolean isInDelay) {
8585
sessionPackage.setPath("/session");
8686
sessionPackage.setSuffix("");
8787

88-
AdjustSigner.sign(parameters, ActivityKind.SESSION.toString(),
89-
sessionPackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
90-
9188
sessionPackage.setParameters(parameters);
9289
return sessionPackage;
9390
}
@@ -98,9 +95,6 @@ ActivityPackage buildEventPackage(AdjustEvent event, boolean isInDelay) {
9895
eventPackage.setPath("/event");
9996
eventPackage.setSuffix(getEventSuffix(event));
10097

101-
AdjustSigner.sign(parameters, ActivityKind.EVENT.toString(),
102-
eventPackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
103-
10498
eventPackage.setParameters(parameters);
10599

106100
if (isInDelay) {
@@ -117,9 +111,6 @@ ActivityPackage buildInfoPackage(String source) {
117111
infoPackage.setPath("/sdk_info");
118112
infoPackage.setSuffix("");
119113

120-
AdjustSigner.sign(parameters, ActivityKind.INFO.toString(),
121-
infoPackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
122-
123114
infoPackage.setParameters(parameters);
124115
return infoPackage;
125116
}
@@ -138,9 +129,6 @@ ActivityPackage buildClickPackage(String source) {
138129
clickPackage.setGooglePlayInstant(googlePlayInstant);
139130
clickPackage.setIsClick(isClick);
140131

141-
AdjustSigner.sign(parameters, ActivityKind.CLICK.toString(),
142-
clickPackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
143-
144132
clickPackage.setParameters(parameters);
145133
return clickPackage;
146134
}
@@ -151,9 +139,6 @@ ActivityPackage buildAttributionPackage(String initiatedByDescription) {
151139
attributionPackage.setPath("attribution"); // does not contain '/' because of Uri.Builder.appendPath
152140
attributionPackage.setSuffix("");
153141

154-
AdjustSigner.sign(parameters, ActivityKind.ATTRIBUTION.toString(),
155-
attributionPackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
156-
157142
attributionPackage.setParameters(parameters);
158143
return attributionPackage;
159144
}
@@ -164,9 +149,6 @@ ActivityPackage buildGdprPackage() {
164149
gdprPackage.setPath("/gdpr_forget_device");
165150
gdprPackage.setSuffix("");
166151

167-
AdjustSigner.sign(parameters, ActivityKind.GDPR.toString(),
168-
gdprPackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
169-
170152
gdprPackage.setParameters(parameters);
171153
return gdprPackage;
172154
}
@@ -177,9 +159,6 @@ ActivityPackage buildDisableThirdPartySharingPackage() {
177159
activityPackage.setPath("/disable_third_party_sharing");
178160
activityPackage.setSuffix("");
179161

180-
AdjustSigner.sign(parameters, ActivityKind.DISABLE_THIRD_PARTY_SHARING.toString(),
181-
activityPackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
182-
183162
activityPackage.setParameters(parameters);
184163
return activityPackage;
185164
}
@@ -192,9 +171,6 @@ ActivityPackage buildThirdPartySharingPackage(
192171
activityPackage.setPath("/third_party_sharing");
193172
activityPackage.setSuffix("");
194173

195-
AdjustSigner.sign(parameters, ActivityKind.THIRD_PARTY_SHARING.toString(),
196-
activityPackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
197-
198174
activityPackage.setParameters(parameters);
199175
return activityPackage;
200176
}
@@ -206,9 +182,6 @@ ActivityPackage buildMeasurementConsentPackage(final boolean consentMeasurement)
206182
activityPackage.setPath("/measurement_consent");
207183
activityPackage.setSuffix("");
208184

209-
AdjustSigner.sign(parameters, ActivityKind.MEASUREMENT_CONSENT.toString(),
210-
activityPackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
211-
212185
activityPackage.setParameters(parameters);
213186
return activityPackage;
214187
}
@@ -219,9 +192,6 @@ ActivityPackage buildAdRevenuePackage(String source, JSONObject adRevenueJson) {
219192
adRevenuePackage.setPath("/ad_revenue");
220193
adRevenuePackage.setSuffix("");
221194

222-
AdjustSigner.sign(parameters, ActivityKind.AD_REVENUE.toString(),
223-
adRevenuePackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
224-
225195
adRevenuePackage.setParameters(parameters);
226196
return adRevenuePackage;
227197
}
@@ -232,9 +202,6 @@ ActivityPackage buildAdRevenuePackage(AdjustAdRevenue adjustAdRevenue, boolean i
232202
adRevenuePackage.setPath("/ad_revenue");
233203
adRevenuePackage.setSuffix("");
234204

235-
AdjustSigner.sign(parameters, ActivityKind.AD_REVENUE.toString(),
236-
adRevenuePackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
237-
238205
adRevenuePackage.setParameters(parameters);
239206

240207
if (isInDelay) {
@@ -251,9 +218,6 @@ ActivityPackage buildSubscriptionPackage(AdjustPlayStoreSubscription subscriptio
251218
subscriptionPackage.setPath("/v2/purchase");
252219
subscriptionPackage.setSuffix("");
253220

254-
AdjustSigner.sign(parameters, ActivityKind.SUBSCRIPTION.toString(),
255-
subscriptionPackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
256-
257221
subscriptionPackage.setParameters(parameters);
258222
return subscriptionPackage;
259223
}
@@ -265,9 +229,6 @@ ActivityPackage buildVerificationPackage(AdjustPurchase purchase, OnPurchaseVeri
265229
purchaseVerificationPackage.setSuffix("");
266230
purchaseVerificationPackage.setPurchaseVerificationCallback(callback);
267231

268-
AdjustSigner.sign(parameters, ActivityKind.PURCHASE_VERIFICATION.toString(),
269-
purchaseVerificationPackage.getClientSdk(), adjustConfig.context, adjustConfig.logger);
270-
271232
purchaseVerificationPackage.setParameters(parameters);
272233
return purchaseVerificationPackage;
273234
}

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.adjust.sdk.network;
22

3+
import android.content.Context;
34
import android.net.Uri;
45

56
import com.adjust.sdk.ActivityKind;
67
import com.adjust.sdk.ActivityPackage;
78
import com.adjust.sdk.AdjustAttribution;
89
import com.adjust.sdk.AdjustFactory;
10+
import com.adjust.sdk.AdjustSigner;
911
import com.adjust.sdk.Constants;
1012
import com.adjust.sdk.ILogger;
1113
import com.adjust.sdk.ResponseData;
@@ -48,19 +50,22 @@ public class ActivityPackageSender implements IActivityPackageSender {
4850
private UrlStrategy urlStrategy;
4951
private IHttpsURLConnectionProvider httpsURLConnectionProvider;
5052
private IConnectionOptions connectionOptions;
53+
private Context context;
5154

5255
public ActivityPackageSender(final String adjustUrlStrategy,
5356
final String basePath,
5457
final String gdprPath,
5558
final String subscriptionPath,
5659
final String purchaseVerificationPath,
57-
final String clientSdk)
60+
final String clientSdk,
61+
final Context context)
5862
{
5963
this.basePath = basePath;
6064
this.gdprPath = gdprPath;
6165
this.subscriptionPath = subscriptionPath;
6266
this.purchaseVerificationPath = purchaseVerificationPath;
6367
this.clientSdk = clientSdk;
68+
this.context = context;
6469

6570
logger = AdjustFactory.getLogger();
6671
executor = new SingleThreadCachedScheduler("ActivityPackageSender");
@@ -92,6 +97,12 @@ public void run() {
9297
public ResponseData sendActivityPackageSync(final ActivityPackage activityPackage,
9398
final Map<String, String> sendingParameters)
9499
{
100+
AdjustSigner.sign(activityPackage.getParameters(),
101+
activityPackage.getActivityKind().toString(),
102+
activityPackage.getClientSdk(),
103+
context,
104+
logger);
105+
95106
boolean retryToSend;
96107
ResponseData responseData;
97108
do {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
// Add SDK via module.
3131
compileOnly project(':sdk-core')
3232
// Add SDK via Maven.
33-
// implementation 'com.adjust.sdk:adjust-android:4.38.1'
33+
// implementation 'com.adjust.sdk:adjust-android:4.38.2'
3434
}
3535

3636
// read local properties

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
// Add SDK via module.
3131
compileOnly project(':sdk-core')
3232
// Add SDK via Maven.
33-
// implementation 'com.adjust.sdk:adjust-android:4.38.1'
33+
// implementation 'com.adjust.sdk:adjust-android:4.38.2'
3434
}
3535

3636
// read local properties

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
// Add SDK via module.
3434
compileOnly project(':sdk-core')
3535
// Add SDK via Maven.
36-
// implementation 'com.adjust.sdk:adjust-android:4.38.1'
36+
// implementation 'com.adjust.sdk:adjust-android:4.38.2'
3737
implementation 'com.huawei.hms:ads-identifier:3.4.56.300'
3838
}
3939

0 commit comments

Comments
 (0)