Skip to content

Commit 03d4f16

Browse files
authored
Merge pull request #453 from adjust/v4230
Version 4.23.0
2 parents 4ff99a8 + cba060f commit 03d4f16

File tree

78 files changed

+1813
-324
lines changed

Some content is hidden

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

78 files changed

+1813
-324
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.22.2"
3+
s.version = "4.23.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.22.2" }
8+
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.23.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: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
2323

2424
/* Begin PBXBuildFile section */
2525
2067002A1F18BDC700B4FDE1 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9601C19C1A31DD7F00A9AE21 /* CoreTelephony.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
26+
6FBEE8F324E2C26F00FEF3F1 /* ADJUrlStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FBEE8F124E2C26F00FEF3F1 /* ADJUrlStrategy.h */; };
27+
6FBEE8F524E2C26F00FEF3F1 /* ADJUrlStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBEE8F224E2C26F00FEF3F1 /* ADJUrlStrategy.m */; };
28+
6FBEE92624E422EB00FEF3F1 /* ADJUrlStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBEE92424E422EB00FEF3F1 /* ADJUrlStrategy.m */; };
29+
6FBEE92724E422EB00FEF3F1 /* ADJUrlStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBEE92424E422EB00FEF3F1 /* ADJUrlStrategy.m */; };
30+
6FBEE92824E422EB00FEF3F1 /* ADJUrlStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FBEE92524E422EB00FEF3F1 /* ADJUrlStrategy.h */; };
31+
6FBEE92924E422EB00FEF3F1 /* ADJUrlStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FBEE92524E422EB00FEF3F1 /* ADJUrlStrategy.h */; };
32+
6FBEE92C24E4230800FEF3F1 /* ADJUrlStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FBEE92A24E4230700FEF3F1 /* ADJUrlStrategy.h */; };
33+
6FBEE92D24E4230800FEF3F1 /* ADJUrlStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBEE92B24E4230700FEF3F1 /* ADJUrlStrategy.m */; };
34+
6FBEE93024E4231400FEF3F1 /* ADJUrlStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FBEE92E24E4231300FEF3F1 /* ADJUrlStrategy.h */; };
35+
6FBEE93124E4231400FEF3F1 /* ADJUrlStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBEE92F24E4231300FEF3F1 /* ADJUrlStrategy.m */; };
36+
6FBEE93424E4232800FEF3F1 /* ADJUrlStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FBEE93224E4232800FEF3F1 /* ADJUrlStrategy.h */; };
37+
6FBEE93524E4232800FEF3F1 /* ADJUrlStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBEE93324E4232800FEF3F1 /* ADJUrlStrategy.m */; };
2638
6FCC85001F278CF300D6A0ED /* ADJReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FCC84F71F278CF300D6A0ED /* ADJReachability.m */; };
2739
6FCC85011F278CF300D6A0ED /* ADJReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FCC84F81F278CF300D6A0ED /* ADJReachability.h */; };
2840
6FCC85041F27945E00D6A0ED /* ADJReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FCC85021F27944600D6A0ED /* ADJReachability.h */; };
@@ -601,6 +613,16 @@
601613
6F0842182007766700568A31 /* AdjustTestLibrary.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdjustTestLibrary.xcodeproj; path = AdjustTestLibrary/AdjustTestLibrary.xcodeproj; sourceTree = "<group>"; };
602614
6F084240200776A000568A31 /* AdjustTestApp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdjustTestApp.xcodeproj; path = AdjustTestApp/AdjustTestApp.xcodeproj; sourceTree = "<group>"; };
603615
6F7AF63F211878BC00F730B2 /* AdjustWebBridgeTestApp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdjustWebBridgeTestApp.xcodeproj; path = AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj; sourceTree = "<group>"; };
616+
6FBEE8F124E2C26F00FEF3F1 /* ADJUrlStrategy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ADJUrlStrategy.h; sourceTree = "<group>"; };
617+
6FBEE8F224E2C26F00FEF3F1 /* ADJUrlStrategy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ADJUrlStrategy.m; sourceTree = "<group>"; };
618+
6FBEE92424E422EB00FEF3F1 /* ADJUrlStrategy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJUrlStrategy.m; sourceTree = "<group>"; };
619+
6FBEE92524E422EB00FEF3F1 /* ADJUrlStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJUrlStrategy.h; sourceTree = "<group>"; };
620+
6FBEE92A24E4230700FEF3F1 /* ADJUrlStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJUrlStrategy.h; sourceTree = "<group>"; };
621+
6FBEE92B24E4230700FEF3F1 /* ADJUrlStrategy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJUrlStrategy.m; sourceTree = "<group>"; };
622+
6FBEE92E24E4231300FEF3F1 /* ADJUrlStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJUrlStrategy.h; sourceTree = "<group>"; };
623+
6FBEE92F24E4231300FEF3F1 /* ADJUrlStrategy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJUrlStrategy.m; sourceTree = "<group>"; };
624+
6FBEE93224E4232800FEF3F1 /* ADJUrlStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJUrlStrategy.h; sourceTree = "<group>"; };
625+
6FBEE93324E4232800FEF3F1 /* ADJUrlStrategy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJUrlStrategy.m; sourceTree = "<group>"; };
604626
6FCC84F71F278CF300D6A0ED /* ADJReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJReachability.m; sourceTree = "<group>"; };
605627
6FCC84F81F278CF300D6A0ED /* ADJReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJReachability.h; sourceTree = "<group>"; };
606628
6FCC85021F27944600D6A0ED /* ADJReachability.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ADJReachability.h; sourceTree = "<group>"; };
@@ -1356,6 +1378,8 @@
13561378
9DD0E9AD1F44690B00B2A759 /* ADJUserDefaults.m */,
13571379
9D2F23E02447CE5C00B7CA90 /* ADJSubscription.h */,
13581380
9D2F23E12447CE5C00B7CA90 /* ADJSubscription.m */,
1381+
6FBEE8F124E2C26F00FEF3F1 /* ADJUrlStrategy.h */,
1382+
6FBEE8F224E2C26F00FEF3F1 /* ADJUrlStrategy.m */,
13591383
);
13601384
path = Adjust;
13611385
sourceTree = "<group>";
@@ -1458,6 +1482,8 @@
14581482
9D0E2E5A210B575600133B4F /* ADJReachability.m */,
14591483
9D2F24032447DD6000B7CA90 /* ADJSubscription.h */,
14601484
9D2F24022447DD6000B7CA90 /* ADJSubscription.m */,
1485+
6FBEE93224E4232800FEF3F1 /* ADJUrlStrategy.h */,
1486+
6FBEE93324E4232800FEF3F1 /* ADJUrlStrategy.m */,
14611487
);
14621488
path = Adjust;
14631489
sourceTree = SOURCE_ROOT;
@@ -1664,6 +1690,8 @@
16641690
9DEAF0F4210072BC005CAEDB /* ADJReachability.m */,
16651691
9D2F23FA2447DD2500B7CA90 /* ADJSubscription.h */,
16661692
9D2F23FB2447DD2500B7CA90 /* ADJSubscription.m */,
1693+
6FBEE92A24E4230700FEF3F1 /* ADJUrlStrategy.h */,
1694+
6FBEE92B24E4230700FEF3F1 /* ADJUrlStrategy.m */,
16671695
);
16681696
path = Adjust;
16691697
sourceTree = SOURCE_ROOT;
@@ -1745,6 +1773,8 @@
17451773
6FCC85031F27944600D6A0ED /* ADJReachability.m */,
17461774
9D2F23F72447DCE800B7CA90 /* ADJSubscription.h */,
17471775
9D2F23F62447DCE800B7CA90 /* ADJSubscription.m */,
1776+
6FBEE92524E422EB00FEF3F1 /* ADJUrlStrategy.h */,
1777+
6FBEE92424E422EB00FEF3F1 /* ADJUrlStrategy.m */,
17481778
);
17491779
path = Adjust;
17501780
sourceTree = SOURCE_ROOT;
@@ -1846,6 +1876,8 @@
18461876
6FCC85061F27948700D6A0ED /* ADJReachability.m */,
18471877
9D2F23FE2447DD3600B7CA90 /* ADJSubscription.h */,
18481878
9D2F23FF2447DD3700B7CA90 /* ADJSubscription.m */,
1879+
6FBEE92E24E4231300FEF3F1 /* ADJUrlStrategy.h */,
1880+
6FBEE92F24E4231300FEF3F1 /* ADJUrlStrategy.m */,
18491881
);
18501882
path = Adjust;
18511883
sourceTree = SOURCE_ROOT;
@@ -1873,10 +1905,12 @@
18731905
96BCFBCD1AC99231005A65C5 /* Adjust.h in Headers */,
18741906
96BCFBCE1AC99235005A65C5 /* ADJEvent.h in Headers */,
18751907
96BCFBD01AC9923F005A65C5 /* ADJConfig.h in Headers */,
1908+
6FBEE92824E422EB00FEF3F1 /* ADJUrlStrategy.h in Headers */,
18761909
9D363AC31BDA50FA00B47FE9 /* ADJLogger.h in Headers */,
18771910
96BCFBD11AC99246005A65C5 /* ADJAttribution.h in Headers */,
18781911
9D2F23E22447CE5C00B7CA90 /* ADJSubscription.h in Headers */,
18791912
9601CAE81C74BAAE00670879 /* ADJEventFailure.h in Headers */,
1913+
6FBEE8F324E2C26F00FEF3F1 /* ADJUrlStrategy.h in Headers */,
18801914
9601CAE41C74B70600670879 /* ADJEventSuccess.h in Headers */,
18811915
6FCC85011F278CF300D6A0ED /* ADJReachability.h in Headers */,
18821916
96BCFBD41AC99338005A65C5 /* NSData+ADJAdditions.h in Headers */,
@@ -1937,6 +1971,7 @@
19371971
9D0E2E98210B575600133B4F /* NSString+ADJAdditions.h in Headers */,
19381972
9D0E2EA7210B575600133B4F /* ADJBackoffStrategy.h in Headers */,
19391973
9D0E2E8C210B575600133B4F /* ADJDeviceInfo.h in Headers */,
1974+
6FBEE93424E4232800FEF3F1 /* ADJUrlStrategy.h in Headers */,
19401975
9D0E2E90210B575600133B4F /* ADJSdkClickHandler.h in Headers */,
19411976
9D0E2E81210B575600133B4F /* ADJUtil.h in Headers */,
19421977
9D0E2E78210B575600133B4F /* ADJPackageHandler.h in Headers */,
@@ -1961,6 +1996,7 @@
19611996
9DE354D62100726300D211C9 /* AdjustSdkIm.h in Headers */,
19621997
9DEAF11C210072BC005CAEDB /* ADJKeychain.h in Headers */,
19631998
9DEAF0F9210072BC005CAEDB /* Adjust.h in Headers */,
1999+
6FBEE92C24E4230800FEF3F1 /* ADJUrlStrategy.h in Headers */,
19642000
9DEAF0F5210072BC005CAEDB /* ADJConfig.h in Headers */,
19652001
9DEAF119210072BC005CAEDB /* ADJEvent.h in Headers */,
19662002
9D2F23FC2447DD2500B7CA90 /* ADJSubscription.h in Headers */,
@@ -2003,6 +2039,7 @@
20032039
9DFA37B71C0F21D600782607 /* AdjustSdk.h in Headers */,
20042040
9DF9C9431D6F3CA5008E362F /* Adjust.h in Headers */,
20052041
9DF9C9231D6F3CA5008E362F /* ADJEvent.h in Headers */,
2042+
6FBEE92924E422EB00FEF3F1 /* ADJUrlStrategy.h in Headers */,
20062043
9DF9C91F1D6F3CA5008E362F /* ADJConfig.h in Headers */,
20072044
9DF9C92B1D6F3CA5008E362F /* ADJLogger.h in Headers */,
20082045
9DF9C9191D6F3CA5008E362F /* ADJAttribution.h in Headers */,
@@ -2045,6 +2082,7 @@
20452082
9DFB06131D747070006D48FC /* AdjustSdkTv.h in Headers */,
20462083
9DFB06941D7470C0006D48FC /* Adjust.h in Headers */,
20472084
9DFB06741D7470C0006D48FC /* ADJEvent.h in Headers */,
2085+
6FBEE93024E4231400FEF3F1 /* ADJUrlStrategy.h in Headers */,
20482086
9DFB06701D7470C0006D48FC /* ADJConfig.h in Headers */,
20492087
9DFB067C1D7470C0006D48FC /* ADJLogger.h in Headers */,
20502088
9DFB066A1D7470C0006D48FC /* ADJAttribution.h in Headers */,
@@ -2565,12 +2603,14 @@
25652603
96E5E39618BBB48A008E7B30 /* ADJRequestHandler.m in Sources */,
25662604
9D2F23E32447CE5C00B7CA90 /* ADJSubscription.m in Sources */,
25672605
96E5E39918BBB48A008E7B30 /* ADJUtil.m in Sources */,
2606+
6FBEE92624E422EB00FEF3F1 /* ADJUrlStrategy.m in Sources */,
25682607
9609BC6A19EEA55800E02303 /* ADJEvent.m in Sources */,
25692608
965307F61A000DA400107FF9 /* ADJDeviceInfo.m in Sources */,
25702609
969952CF1A012F5300928462 /* ADJAttributionHandler.m in Sources */,
25712610
969952D21A01309200928462 /* ADJAttribution.m in Sources */,
25722611
960A8BB91A029A8000F2BB95 /* ADJConfig.m in Sources */,
25732612
96854A5A1B1F2779002B2874 /* ADJTimerOnce.m in Sources */,
2613+
6FBEE8F524E2C26F00FEF3F1 /* ADJUrlStrategy.m in Sources */,
25742614
96854A601B1F278C002B2874 /* ADJTimerCycle.m in Sources */,
25752615
96FCC53B1C186426007BBFE1 /* ADJResponseData.m in Sources */,
25762616
968173841C3C2D07002AE1DE /* ADJSessionSuccess.m in Sources */,
@@ -2656,6 +2696,7 @@
26562696
9D0E2EBB210B575600133B4F /* AdjustBridgeRegister.m in Sources */,
26572697
9D0E2E84210B575600133B4F /* ADJTimerCycle.m in Sources */,
26582698
9D0E2E6C210B575600133B4F /* ADJDeviceInfo.m in Sources */,
2699+
6FBEE93524E4232800FEF3F1 /* ADJUrlStrategy.m in Sources */,
26592700
9D0E2EA5210B575600133B4F /* ADJPackageBuilder.m in Sources */,
26602701
9D0E2EAD210B575600133B4F /* ADJReachability.m in Sources */,
26612702
9D0E2E99210B575600133B4F /* ADJAttribution.m in Sources */,
@@ -2702,6 +2743,7 @@
27022743
9DEAF118210072BC005CAEDB /* ADJPackageHandler.m in Sources */,
27032744
9DEAF110210072BC005CAEDB /* ADJLogger.m in Sources */,
27042745
9DEAF0F7210072BC005CAEDB /* ADJTimerOnce.m in Sources */,
2746+
6FBEE92D24E4230800FEF3F1 /* ADJUrlStrategy.m in Sources */,
27052747
9DEAF101210072BC005CAEDB /* ADJEvent.m in Sources */,
27062748
9DEAF117210072BC005CAEDB /* ADJConfig.m in Sources */,
27072749
9DEAF0F8210072BC005CAEDB /* ADJAttributionHandler.m in Sources */,
@@ -2743,6 +2785,7 @@
27432785
9DF9C91C1D6F3CA5008E362F /* ADJAttributionHandler.m in Sources */,
27442786
9DF9C91A1D6F3CA5008E362F /* ADJAttribution.m in Sources */,
27452787
9DF9C9201D6F3CA5008E362F /* ADJConfig.m in Sources */,
2788+
6FBEE92724E422EB00FEF3F1 /* ADJUrlStrategy.m in Sources */,
27462789
9DF9C9401D6F3CA5008E362F /* ADJTimerOnce.m in Sources */,
27472790
9DF9C93E1D6F3CA5008E362F /* ADJTimerCycle.m in Sources */,
27482791
9DF9C9341D6F3CA5008E362F /* ADJResponseData.m in Sources */,
@@ -2784,6 +2827,7 @@
27842827
9DFB066D1D7470C0006D48FC /* ADJAttributionHandler.m in Sources */,
27852828
9DFB066B1D7470C0006D48FC /* ADJAttribution.m in Sources */,
27862829
9DFB06711D7470C0006D48FC /* ADJConfig.m in Sources */,
2830+
6FBEE93124E4231400FEF3F1 /* ADJUrlStrategy.m in Sources */,
27872831
9DFB06911D7470C0006D48FC /* ADJTimerOnce.m in Sources */,
27882832
9DFB068F1D7470C0006D48FC /* ADJTimerCycle.m in Sources */,
27892833
9DFB06851D7470C0006D48FC /* ADJResponseData.m in Sources */,

Adjust/ADJActivityHandler.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,13 @@
5050

5151
@end
5252

53+
@class ADJTrackingStatusManager;
54+
5355
@protocol ADJActivityHandler <NSObject>
5456

5557
@property (nonatomic, copy) ADJAttribution *attribution;
58+
@property (nonatomic, strong) ADJTrackingStatusManager *trackingStatusManager;
59+
5660
- (NSString *)adid;
5761

5862
- (id)initWithConfig:(ADJConfig *)adjustConfig
@@ -97,6 +101,7 @@
97101
- (void)trackAdRevenue:(NSString *)soruce payload:(NSData *)payload;
98102
- (void)disableThirdPartySharing;
99103
- (void)trackSubscription:(ADJSubscription *)subscription;
104+
- (void)updateAttStatusFromUserCallback:(int)newAttStatusFromUser;
100105

101106
- (ADJDeviceInfo *)deviceInfo;
102107
- (ADJActivityState *)activityState;
@@ -128,4 +133,18 @@
128133

129134
@end
130135

136+
@interface ADJTrackingStatusManager : NSObject
137+
138+
- (instancetype)initWithActivityHandler:(ADJActivityHandler *)activityHandler;
139+
140+
- (void)checkForNewAttStatus;
141+
- (void)updateAttStatusFromUserCallback:(int)newAttStatusFromUser;
142+
143+
- (BOOL)canGetAttStatus;
144+
145+
@property (nonatomic, readonly, assign) BOOL trackingEnabled;
146+
@property (nonatomic, readonly, assign) int attStatus;
147+
148+
@end
149+
131150
extern NSString * const ADJiAdPackageKey;

0 commit comments

Comments
 (0)