Skip to content

Commit 85f6a71

Browse files
uerceguerceg
authored
Merge pull request #499 from adjust/v4260
Version 4.26.0
2 parents 936af17 + 4a366f2 commit 85f6a71

File tree

44 files changed

+212
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+212
-159
lines changed

‎Adjust.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Pod::Spec.new do |s|
22
s.name = "Adjust"
3-
s.version = "4.25.2"
3+
s.version = "4.26.0"
44
s.summary = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
55
s.homepage = "https://github.com/adjust/ios_sdk"
66
s.license = { :type => 'MIT', :file => 'MIT-LICENSE' }
77
s.author = { "Christian Wellenbrock" => "[email protected]" }
8-
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.25.2" }
8+
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.26.0" }
99
s.ios.deployment_target = '6.0'
1010
s.tvos.deployment_target = '9.0'
1111
s.framework = 'SystemConfiguration'

‎Adjust.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2302,7 +2302,7 @@
23022302
9679920518BBAE2800394606 /* Project object */ = {
23032303
isa = PBXProject;
23042304
attributes = {
2305-
LastUpgradeCheck = 1220;
2305+
LastUpgradeCheck = 1240;
23062306
ORGANIZATIONNAME = "adjust GmbH";
23072307
TargetAttributes = {
23082308
9615158E1CD2CB2C0022D336 = {

‎Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1240"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkIm.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1240"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1240"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkWebBridge.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1240"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Adjust/ADJActivityHandler.h‎

Lines changed: 59 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
@property (nonatomic, assign) BOOL firstLaunch;
2424
@property (nonatomic, assign) BOOL sessionResponseProcessed;
2525

26-
- (id)init;
26+
- (_Nullable id)init;
2727

2828
- (BOOL)isEnabled;
2929
- (BOOL)isDisabled;
@@ -41,108 +41,111 @@
4141

4242
@interface ADJSavedPreLaunch : NSObject
4343

44-
@property (nonatomic, strong) NSMutableArray *preLaunchActionsArray;
45-
@property (nonatomic, copy) NSData *deviceTokenData;
46-
@property (nonatomic, copy) NSNumber *enabled;
44+
@property (nonatomic, strong) NSMutableArray * _Nullable preLaunchActionsArray;
45+
@property (nonatomic, copy) NSData *_Nullable deviceTokenData;
46+
@property (nonatomic, copy) NSNumber *_Nullable enabled;
4747
@property (nonatomic, assign) BOOL offline;
48-
@property (nonatomic, copy) NSString *extraPath;
49-
@property (nonatomic, strong) NSMutableArray *preLaunchAdjustThirdPartySharingArray;
50-
@property (nonatomic, copy) NSNumber *lastMeasurementConsentTracked;
48+
@property (nonatomic, copy) NSString *_Nullable extraPath;
49+
@property (nonatomic, strong) NSMutableArray *_Nullable preLaunchAdjustThirdPartySharingArray;
50+
@property (nonatomic, copy) NSNumber *_Nullable lastMeasurementConsentTracked;
5151

52-
- (id)init;
52+
- (id _Nullable)init;
5353

5454
@end
5555

5656
@class ADJTrackingStatusManager;
5757

5858
@protocol ADJActivityHandler <NSObject>
5959

60-
@property (nonatomic, copy) ADJAttribution *attribution;
61-
@property (nonatomic, strong) ADJTrackingStatusManager *trackingStatusManager;
60+
@property (nonatomic, copy) ADJAttribution * _Nullable attribution;
61+
@property (nonatomic, strong) ADJTrackingStatusManager * _Nullable trackingStatusManager;
6262

63-
- (NSString *)adid;
63+
- (NSString *_Nullable)adid;
6464

65-
- (id)initWithConfig:(ADJConfig *)adjustConfig
66-
savedPreLaunch:(ADJSavedPreLaunch *)savedPreLaunch;
65+
- (id _Nullable)initWithConfig:(ADJConfig *_Nullable)adjustConfig
66+
savedPreLaunch:(ADJSavedPreLaunch * _Nullable)savedPreLaunch;
6767

6868
- (void)applicationDidBecomeActive;
6969
- (void)applicationWillResignActive;
7070

71-
- (void)trackEvent:(ADJEvent *)event;
71+
- (void)trackEvent:(ADJEvent * _Nullable)event;
7272

73-
- (void)finishedTracking:(ADJResponseData *)responseData;
74-
- (void)launchEventResponseTasks:(ADJEventResponseData *)eventResponseData;
75-
- (void)launchSessionResponseTasks:(ADJSessionResponseData *)sessionResponseData;
76-
- (void)launchSdkClickResponseTasks:(ADJSdkClickResponseData *)sdkClickResponseData;
77-
- (void)launchAttributionResponseTasks:(ADJAttributionResponseData *)attributionResponseData;
73+
- (void)finishedTracking:(ADJResponseData * _Nullable)responseData;
74+
- (void)launchEventResponseTasks:(ADJEventResponseData * _Nullable)eventResponseData;
75+
- (void)launchSessionResponseTasks:(ADJSessionResponseData * _Nullable)sessionResponseData;
76+
- (void)launchSdkClickResponseTasks:(ADJSdkClickResponseData * _Nullable)sdkClickResponseData;
77+
- (void)launchAttributionResponseTasks:(ADJAttributionResponseData * _Nullable)attributionResponseData;
7878
- (void)setEnabled:(BOOL)enabled;
7979
- (BOOL)isEnabled;
8080
- (BOOL)isGdprForgotten;
8181

82-
- (void)appWillOpenUrl:(NSURL*)url withClickTime:(NSDate *)clickTime;
83-
- (void)setDeviceToken:(NSData *)deviceToken;
84-
- (void)setPushToken:(NSString *)deviceToken;
82+
- (void)appWillOpenUrl:(NSURL * _Nullable)url
83+
withClickTime:(NSDate * _Nullable)clickTime;
84+
- (void)setDeviceToken:(NSData * _Nullable)deviceToken;
85+
- (void)setPushToken:(NSString * _Nullable)deviceToken;
8586
- (void)setGdprForgetMe;
8687
- (void)setTrackingStateOptedOut;
8788
- (void)setAskingAttribution:(BOOL)askingAttribution;
8889

89-
- (BOOL)updateAttributionI:(id<ADJActivityHandler>)selfI attribution:(ADJAttribution *)attribution;
90-
- (void)setAttributionDetails:(NSDictionary *)attributionDetails
91-
error:(NSError *)error;
92-
- (void)setAdServicesAttributionToken:(NSString *)token
93-
error:(NSError *)error;
90+
- (BOOL)updateAttributionI:(id<ADJActivityHandler> _Nullable)selfI
91+
attribution:(ADJAttribution * _Nullable)attribution;
92+
- (void)setAttributionDetails:(NSDictionary * _Nullable)attributionDetails
93+
error:(NSError * _Nullable)error;
94+
- (void)setAdServicesAttributionToken:(NSString * _Nullable)token
95+
error:(NSError * _Nullable)error;
9496

9597
- (void)setOfflineMode:(BOOL)offline;
9698
- (void)sendFirstPackages;
9799

98-
- (void)addSessionCallbackParameter:(NSString *)key
99-
value:(NSString *)value;
100-
- (void)addSessionPartnerParameter:(NSString *)key
101-
value:(NSString *)value;
102-
- (void)removeSessionCallbackParameter:(NSString *)key;
103-
- (void)removeSessionPartnerParameter:(NSString *)key;
100+
- (void)addSessionCallbackParameter:(NSString * _Nullable)key
101+
value:(NSString * _Nullable)value;
102+
- (void)addSessionPartnerParameter:(NSString * _Nullable)key
103+
value:(NSString * _Nullable)value;
104+
- (void)removeSessionCallbackParameter:(NSString * _Nullable)key;
105+
- (void)removeSessionPartnerParameter:(NSString * _Nullable)key;
104106
- (void)resetSessionCallbackParameters;
105107
- (void)resetSessionPartnerParameters;
106-
- (void)trackAdRevenue:(NSString *)soruce payload:(NSData *)payload;
108+
- (void)trackAdRevenue:(NSString * _Nullable)soruce
109+
payload:(NSData * _Nullable)payload;
107110
- (void)disableThirdPartySharing;
108111
- (void)trackThirdPartySharing:(nonnull ADJThirdPartySharing *)thirdPartySharing;
109112
- (void)trackMeasurementConsent:(BOOL)enabled;
110-
- (void)trackSubscription:(ADJSubscription *)subscription;
113+
- (void)trackSubscription:(ADJSubscription * _Nullable)subscription;
111114
- (void)updateAttStatusFromUserCallback:(int)newAttStatusFromUser;
112115

113-
- (ADJDeviceInfo *)deviceInfo;
114-
- (ADJActivityState *)activityState;
115-
- (ADJConfig *)adjustConfig;
116-
- (ADJSessionParameters *)sessionParameters;
116+
- (ADJDeviceInfo * _Nullable)deviceInfo;
117+
- (ADJActivityState * _Nullable)activityState;
118+
- (ADJConfig * _Nullable)adjustConfig;
119+
- (ADJSessionParameters * _Nullable)sessionParameters;
117120

118121
- (void)teardown;
119122
+ (void)deleteState;
120123
@end
121124

122125
@interface ADJActivityHandler : NSObject <ADJActivityHandler>
123126

124-
- (id)initWithConfig:(ADJConfig *)adjustConfig
125-
savedPreLaunch:(ADJSavedPreLaunch *)savedPreLaunch;
127+
- (id _Nullable)initWithConfig:(ADJConfig * _Nullable)adjustConfig
128+
savedPreLaunch:(ADJSavedPreLaunch * _Nullable)savedPreLaunch;
126129

127-
- (void)addSessionCallbackParameterI:(ADJActivityHandler *)selfI
128-
key:(NSString *)key
129-
value:(NSString *)value;
130+
- (void)addSessionCallbackParameterI:(ADJActivityHandler * _Nullable)selfI
131+
key:(NSString * _Nullable)key
132+
value:(NSString * _Nullable)value;
130133

131-
- (void)addSessionPartnerParameterI:(ADJActivityHandler *)selfI
132-
key:(NSString *)key
133-
value:(NSString *)value;
134-
- (void)removeSessionCallbackParameterI:(ADJActivityHandler *)selfI
135-
key:(NSString *)key;
136-
- (void)removeSessionPartnerParameterI:(ADJActivityHandler *)selfI
137-
key:(NSString *)key;
138-
- (void)resetSessionCallbackParametersI:(ADJActivityHandler *)selfI;
139-
- (void)resetSessionPartnerParametersI:(ADJActivityHandler *)selfI;
134+
- (void)addSessionPartnerParameterI:(ADJActivityHandler * _Nullable)selfI
135+
key:(NSString * _Nullable)key
136+
value:(NSString * _Nullable)value;
137+
- (void)removeSessionCallbackParameterI:(ADJActivityHandler * _Nullable)selfI
138+
key:(NSString * _Nullable)key;
139+
- (void)removeSessionPartnerParameterI:(ADJActivityHandler * _Nullable)selfI
140+
key:(NSString * _Nullable)key;
141+
- (void)resetSessionCallbackParametersI:(ADJActivityHandler * _Nullable)selfI;
142+
- (void)resetSessionPartnerParametersI:(ADJActivityHandler * _Nullable)selfI;
140143

141144
@end
142145

143146
@interface ADJTrackingStatusManager : NSObject
144147

145-
- (instancetype)initWithActivityHandler:(ADJActivityHandler *)activityHandler;
148+
- (instancetype _Nullable)initWithActivityHandler:(ADJActivityHandler * _Nullable)activityHandler;
146149

147150
- (void)checkForNewAttStatus;
148151
- (void)updateAttStatusFromUserCallback:(int)newAttStatusFromUser;
@@ -154,5 +157,5 @@
154157

155158
@end
156159

157-
extern NSString * const ADJiAdPackageKey;
158-
extern NSString * const ADJAdServicesPackageKey;
160+
extern NSString * _Nullable const ADJiAdPackageKey;
161+
extern NSString * _Nullable const ADJAdServicesPackageKey;

‎Adjust/ADJActivityHandler.m‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2708,29 +2708,8 @@ - (void)checkConversionValue:(ADJResponseData *)responseData {
27082708
if (!conversionValue) {
27092709
return;
27102710
}
2711-
2712-
id<ADJLogger> logger = [ADJAdjustFactory logger];
2713-
2714-
Class skAdNetwork = NSClassFromString(@"SKAdNetwork");
2715-
if (skAdNetwork == nil) {
2716-
[logger warn:@"StoreKit framework not found in user's app (SKAdNetwork not found)"];
2717-
return;
2718-
}
27192711

2720-
SEL updateConversionValueSelector = NSSelectorFromString(@"updateConversionValue:");
2721-
if ([skAdNetwork respondsToSelector:updateConversionValueSelector]) {
2722-
NSInteger intValue = [conversionValue integerValue];
2723-
2724-
NSMethodSignature *conversionValueMethodSignature = [skAdNetwork methodSignatureForSelector:updateConversionValueSelector];
2725-
NSInvocation *conversionInvocation = [NSInvocation invocationWithMethodSignature:conversionValueMethodSignature];
2726-
[conversionInvocation setSelector:updateConversionValueSelector];
2727-
[conversionInvocation setTarget:skAdNetwork];
2728-
2729-
[conversionInvocation setArgument:&intValue atIndex:2];
2730-
[conversionInvocation invoke];
2731-
2732-
[logger verbose:@"Call to SKAdNetwork's updateConversionValue: method made with value %d", intValue];
2733-
}
2712+
[ADJUtil updateSkAdNetworkConversionValue:conversionValue];
27342713
}
27352714

27362715
- (void)updateAttStatusFromUserCallback:(int)newAttStatusFromUser {

‎Adjust/ADJPackageBuilder.h‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,71 +18,71 @@
1818

1919
@interface ADJPackageBuilder : NSObject
2020

21-
@property (nonatomic, copy) NSString *deeplink;
21+
@property (nonatomic, copy) NSString * _Nullable deeplink;
2222

23-
@property (nonatomic, copy) NSDate *clickTime;
23+
@property (nonatomic, copy) NSDate * _Nullable clickTime;
2424

25-
@property (nonatomic, copy) NSDate *purchaseTime;
25+
@property (nonatomic, copy) NSDate * _Nullable purchaseTime;
2626

27-
@property (nonatomic, strong) NSDictionary *attributionDetails;
27+
@property (nonatomic, strong) NSDictionary * _Nullable attributionDetails;
2828

29-
@property (nonatomic, strong) NSDictionary *deeplinkParameters;
29+
@property (nonatomic, strong) NSDictionary * _Nullable deeplinkParameters;
3030

31-
@property (nonatomic, copy) ADJAttribution *attribution;
31+
@property (nonatomic, copy) ADJAttribution * _Nullable attribution;
3232

33-
- (id)initWithDeviceInfo:(ADJDeviceInfo *)deviceInfo
34-
activityState:(ADJActivityState *)activityState
35-
config:(ADJConfig *)adjustConfig
36-
sessionParameters:(ADJSessionParameters *)sessionParameters
37-
trackingStatusManager:(ADJTrackingStatusManager *)trackingStatusManager
38-
createdAt:(double)createdAt;
33+
- (id _Nullable)initWithDeviceInfo:(ADJDeviceInfo * _Nullable)deviceInfo
34+
activityState:(ADJActivityState * _Nullable)activityState
35+
config:(ADJConfig * _Nullable)adjustConfig
36+
sessionParameters:(ADJSessionParameters * _Nullable)sessionParameters
37+
trackingStatusManager:(ADJTrackingStatusManager * _Nullable)trackingStatusManager
38+
createdAt:(double)createdAt;
3939

40-
- (ADJActivityPackage *)buildSessionPackage:(BOOL)isInDelay;
40+
- (ADJActivityPackage * _Nullable)buildSessionPackage:(BOOL)isInDelay;
4141

42-
- (ADJActivityPackage *)buildEventPackage:(ADJEvent *)event
42+
- (ADJActivityPackage * _Nullable)buildEventPackage:(ADJEvent * _Nullable)event
4343
isInDelay:(BOOL)isInDelay;
4444

45-
- (ADJActivityPackage *)buildInfoPackage:(NSString *)infoSource;
45+
- (ADJActivityPackage * _Nullable)buildInfoPackage:(NSString * _Nullable)infoSource;
4646

47-
- (ADJActivityPackage *)buildAdRevenuePackage:(NSString *)source payload:(NSData *)payload;
47+
- (ADJActivityPackage * _Nullable)buildAdRevenuePackage:(NSString * _Nullable)source payload:(NSData * _Nullable)payload;
4848

49-
- (ADJActivityPackage *)buildClickPackage:(NSString *)clickSource;
49+
- (ADJActivityPackage * _Nullable)buildClickPackage:(NSString * _Nullable)clickSource;
5050

51-
- (ADJActivityPackage *)buildClickPackage:(NSString *)clickSource
52-
token:(NSString *)token
53-
errorCodeNumber:(NSNumber *)errorCodeNumber;
51+
- (ADJActivityPackage * _Nullable)buildClickPackage:(NSString * _Nullable)clickSource
52+
token:(NSString * _Nullable)token
53+
errorCodeNumber:(NSNumber * _Nullable)errorCodeNumber;
5454

55-
- (ADJActivityPackage *)buildAttributionPackage:(NSString *)initiatedBy;
55+
- (ADJActivityPackage * _Nullable)buildAttributionPackage:(NSString * _Nullable)initiatedBy;
5656

57-
- (ADJActivityPackage *)buildGdprPackage;
57+
- (ADJActivityPackage * _Nullable)buildGdprPackage;
5858

59-
- (ADJActivityPackage *)buildDisableThirdPartySharingPackage;
59+
- (ADJActivityPackage * _Nullable)buildDisableThirdPartySharingPackage;
6060

61-
- (ADJActivityPackage *)buildThirdPartySharingPackage:(nonnull ADJThirdPartySharing *)thirdPartySharing;
61+
- (ADJActivityPackage * _Nullable)buildThirdPartySharingPackage:(nonnull ADJThirdPartySharing *)thirdPartySharing;
6262

63-
- (ADJActivityPackage *)buildMeasurementConsentPackage:(BOOL)enabled;
63+
- (ADJActivityPackage * _Nullable)buildMeasurementConsentPackage:(BOOL)enabled;
6464

65-
- (ADJActivityPackage *)buildSubscriptionPackage:(ADJSubscription *)subscription
66-
isInDelay:(BOOL)isInDelay;
65+
- (ADJActivityPackage * _Nullable)buildSubscriptionPackage:( ADJSubscription * _Nullable)subscription
66+
isInDelay:(BOOL)isInDelay;
6767

68-
+ (void)parameters:(NSMutableDictionary *)parameters
69-
setDictionary:(NSDictionary *)dictionary
70-
forKey:(NSString *)key;
68+
+ (void)parameters:(NSMutableDictionary * _Nullable)parameters
69+
setDictionary:(NSDictionary * _Nullable)dictionary
70+
forKey:(NSString * _Nullable)key;
7171

72-
+ (void)parameters:(NSMutableDictionary *)parameters
73-
setString:(NSString *)value
74-
forKey:(NSString *)key;
72+
+ (void)parameters:(NSMutableDictionary * _Nullable)parameters
73+
setString:(NSString * _Nullable)value
74+
forKey:(NSString * _Nullable)key;
7575

76-
+ (void)parameters:(NSMutableDictionary *)parameters
76+
+ (void)parameters:(NSMutableDictionary * _Nullable)parameters
7777
setInt:(int)value
78-
forKey:(NSString *)key;
78+
forKey:(NSString * _Nullable)key;
7979

80-
+ (void)parameters:(NSMutableDictionary *)parameters
80+
+ (void)parameters:(NSMutableDictionary * _Nullable)parameters
8181
setDate1970:(double)value
82-
forKey:(NSString *)key;
82+
forKey:(NSString * _Nullable)key;
8383

84-
+ (BOOL)isAdServicesPackage:(ADJActivityPackage *)activityPackage;
84+
+ (BOOL)isAdServicesPackage:(ADJActivityPackage * _Nullable)activityPackage;
8585

8686
@end
8787
// TODO change to ADJ...
88-
extern NSString * const ADJAttributionTokenParameter;
88+
extern NSString * _Nullable const ADJAttributionTokenParameter;

‎Adjust/ADJUtil.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,6 @@ typedef void (^isInactiveInjected)(BOOL);
121121
+ (NSString *)enforceParameterLength:(NSString *)parameter
122122
withMaxlength:(NSUInteger)maxLength;
123123

124+
+ (void)updateSkAdNetworkConversionValue:(NSNumber *)conversionValue;
125+
124126
@end

0 commit comments

Comments
 (0)