File tree Expand file tree Collapse file tree 10 files changed +872
-688
lines changed
plugins/oaid/android/libs Expand file tree Collapse file tree 10 files changed +872
-688
lines changed Original file line number Diff line number Diff line change @@ -1030,6 +1030,28 @@ - (void)processSessionI:(ADJActivityHandler *)selfI {
1030
1030
[ADJUserDefaults removeDisableThirdPartySharing ];
1031
1031
1032
1032
return ;
1033
+ } else {
1034
+ // these checks should run after SDK initialization after the first one
1035
+ if ([ADJUserDefaults getDisableThirdPartySharing ]) {
1036
+ [selfI disableThirdPartySharingI: selfI];
1037
+ }
1038
+ if (selfI.savedPreLaunch .preLaunchAdjustThirdPartySharingArray != nil ) {
1039
+ for (ADJThirdPartySharing *thirdPartySharing
1040
+ in selfI.savedPreLaunch .preLaunchAdjustThirdPartySharingArray )
1041
+ {
1042
+ [selfI trackThirdPartySharingI: selfI
1043
+ thirdPartySharing: thirdPartySharing];
1044
+ }
1045
+
1046
+ selfI.savedPreLaunch .preLaunchAdjustThirdPartySharingArray = nil ;
1047
+ }
1048
+ if (selfI.savedPreLaunch .lastMeasurementConsentTracked != nil ) {
1049
+ [selfI
1050
+ trackMeasurementConsentI: selfI
1051
+ enabled: [selfI.savedPreLaunch.lastMeasurementConsentTracked boolValue ]];
1052
+
1053
+ selfI.savedPreLaunch .lastMeasurementConsentTracked = nil ;
1054
+ }
1033
1055
}
1034
1056
1035
1057
double lastInterval = now - selfI.activityState .lastActivity ;
Original file line number Diff line number Diff line change @@ -1385,23 +1385,30 @@ + (void)addIdfaToParameters:(NSMutableDictionary * _Nullable)parameters
1385
1385
return ;
1386
1386
}
1387
1387
1388
- // read once && IDFA not cached
1389
- if (adjConfig.readDeviceInfoOnceEnabled && packageParams.idfaCached != nil ) {
1390
- [ADJPackageBuilder parameters: parameters setString: packageParams.idfaCached forKey: @" idfa" ];
1391
- return ;
1392
- }
1388
+ __block NSString *idfa = nil ;
1389
+ [ADJUtil launchSynchronisedWithObject: [ADJPackageBuilder class ] block: ^{
1390
+ // read once && IDFA not cached
1391
+ if (adjConfig.readDeviceInfoOnceEnabled && packageParams.idfaCached != nil ) {
1392
+ idfa = packageParams.idfaCached ;
1393
+ } else {
1394
+ // read IDFA
1395
+ idfa = [ADJUtil idfa ];
1396
+ if (idfa == nil ||
1397
+ idfa.length == 0 ||
1398
+ [idfa isEqualToString: @" 00000000-0000-0000-0000-000000000000" ])
1399
+ {
1400
+ idfa = nil ;
1401
+ } else {
1402
+ // cache IDFA
1403
+ packageParams.idfaCached = idfa;
1404
+ }
1405
+ }
1406
+ }];
1393
1407
1394
- // read IDFA
1395
- NSString *idfa = [ADJUtil idfa ];
1396
- if (idfa == nil ||
1397
- idfa.length == 0 ||
1398
- [idfa isEqualToString: @" 00000000-0000-0000-0000-000000000000" ]) {
1399
- return ;
1408
+ if (idfa != nil ) {
1409
+ // add IDFA to payload
1410
+ [ADJPackageBuilder parameters: parameters setString: idfa forKey: @" idfa" ];
1400
1411
}
1401
- // cache IDFA
1402
- packageParams.idfaCached = idfa;
1403
- // add IDFA to payload
1404
- [ADJPackageBuilder parameters: parameters setString: idfa forKey: @" idfa" ];
1405
1412
}
1406
1413
1407
1414
@end
Original file line number Diff line number Diff line change @@ -58,6 +58,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceHeliumChartboost;
58
58
extern NSString * __nonnull const ADJAdRevenueSourcePublisher;
59
59
extern NSString * __nonnull const ADJAdRevenueSourceTopOn;
60
60
extern NSString * __nonnull const ADJAdRevenueSourceADX;
61
+ extern NSString * __nonnull const ADJAdRevenueSourceTradplus;
61
62
62
63
/* *
63
64
* Constants for country app's URL strategies.
Original file line number Diff line number Diff line change 32
32
NSString * const ADJAdRevenueSourcePublisher = @" publisher_sdk" ;
33
33
NSString * const ADJAdRevenueSourceTopOn = @" topon_sdk" ;
34
34
NSString * const ADJAdRevenueSourceADX = @" adx_sdk" ;
35
+ NSString * const ADJAdRevenueSourceTradplus = @" tradplus_sdk" ;
35
36
36
37
NSString * const ADJUrlStrategyIndia = @" UrlStrategyIndia" ;
37
38
NSString * const ADJUrlStrategyChina = @" UrlStrategyChina" ;
Original file line number Diff line number Diff line change @@ -58,6 +58,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceHeliumChartboost;
58
58
extern NSString * __nonnull const ADJAdRevenueSourcePublisher;
59
59
extern NSString * __nonnull const ADJAdRevenueSourceTopOn;
60
60
extern NSString * __nonnull const ADJAdRevenueSourceADX;
61
+ extern NSString * __nonnull const ADJAdRevenueSourceTradplus;
61
62
62
63
/* *
63
64
* Constants for country app's URL strategies.
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ const App: () => React$Node = () => {
50
50
var baseUrl = "" ;
51
51
var gdprUrl = "" ;
52
52
var subscriptionUrl = "" ;
53
- var ipAddress = "192.168.8.70 " ;
53
+ var ipAddress = "192.168.8.64 " ;
54
54
if ( Platform . OS === "android" ) {
55
55
baseUrl = "https://" + ipAddress + ":8443" ;
56
56
gdprUrl = "https://" + ipAddress + ":8443" ;
Load Diff Large diffs are not rendered by default.
You can’t perform that action at this time.
0 commit comments