Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d0cc98f
Initial subscription tracking implementation
uerceg Apr 16, 2020
8ec63c7
Use subscription activity kind for package
uerceg Apr 16, 2020
43c8f2a
Fix activity kind for subscription package in request handler
uerceg Apr 16, 2020
464c993
Track subscription in example app
uerceg Apr 16, 2020
2049e13
Set subscription endpoint URL
uerceg Apr 21, 2020
84a93ae
Synchronise public API methods access
uerceg Apr 22, 2020
d3ea191
Synchronise trackSubscription: method
uerceg Apr 23, 2020
8fd4ea8
Reinitialise internalSubscriptionUrl in teardown method
uerceg Apr 23, 2020
8921382
Refac subscription
nonelse Apr 23, 2020
8c6ecff
Link read-only subscription parameters with mutable
nonelse Apr 23, 2020
d3d3ea3
Add syncronized to subscription parameters
nonelse Apr 23, 2020
9587784
Fix typo
nonelse Apr 23, 2020
cc7ea43
Add subscription test handling
nonelse Apr 23, 2020
08fd2d5
Clean up examlple Obj-C app
uerceg Apr 27, 2020
0d32df2
Change price (double->NSDecimalNumber) and transactionDate (double->N…
uerceg Apr 27, 2020
f644c71
No need for event_count in subscription package
uerceg Apr 29, 2020
313681c
Make mandatory fields to be softly mandatory
uerceg Apr 29, 2020
0328aef
Remove install_receipt from subscription payload
uerceg May 5, 2020
1fdf4af
Update README.md
uerceg May 12, 2020
6def8c3
Update README.md
uerceg May 12, 2020
1c2caaf
Add sales_region parameter and make transaction_date optional
uerceg May 14, 2020
027f101
Update README.md
uerceg May 14, 2020
aeb32bf
Extract networking into request handler
nonelse May 19, 2020
c227e64
New version 4.22.0
uerceg May 25, 2020
201c540
CHANGELOG.md update
uerceg May 25, 2020
a8061c5
Update README.md
mcoombs May 26, 2020
2c43969
Update README.md
mcoombs May 26, 2020
505d083
Remove some log messages
uerceg May 26, 2020
6e6afff
Remove unused timeout constant
uerceg May 27, 2020
7f65052
Activity state synchronisation
uerceg May 27, 2020
8fa2ea0
Package queue synchronisation
uerceg May 27, 2020
925e47e
Xcode update
uerceg May 27, 2020
83dc72b
CHANGELOG.md update
uerceg May 28, 2020
a8a06a2
CHANGELOG.md update
uerceg May 28, 2020
fa721bc
Migrate web bridge test app to use extra path
uerceg May 28, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Adjust.podspec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Pod::Spec.new do |s|
s.name = "Adjust"
s.version = "4.21.3"
s.version = "4.22.0"
s.summary = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
s.homepage = "https://github.com/adjust/ios_sdk"
s.license = { :type => 'MIT', :file => 'MIT-LICENSE' }
s.author = { "Christian Wellenbrock" => "welle@adjust.com" }
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.21.3" }
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.22.0" }
s.ios.deployment_target = '6.0'
s.tvos.deployment_target = '9.0'
s.framework = 'SystemConfiguration'
Expand Down
42 changes: 41 additions & 1 deletion Adjust.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,16 @@
9D0E2EB9210B575600133B4F /* WKWebViewJavascriptBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D0E2E68210B575600133B4F /* WKWebViewJavascriptBridge.h */; settings = {ATTRIBUTES = (Public, ); }; };
9D0E2EBA210B575600133B4F /* AdjustBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D0E2E69210B575600133B4F /* AdjustBridge.h */; settings = {ATTRIBUTES = (Public, ); }; };
9D0E2EBB210B575600133B4F /* AdjustBridgeRegister.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D0E2E6A210B575600133B4F /* AdjustBridgeRegister.m */; };
9D2F23E22447CE5C00B7CA90 /* ADJSubscription.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D2F23E02447CE5C00B7CA90 /* ADJSubscription.h */; settings = {ATTRIBUTES = (Public, ); }; };
9D2F23E32447CE5C00B7CA90 /* ADJSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D2F23E12447CE5C00B7CA90 /* ADJSubscription.m */; };
9D2F23F82447DCE800B7CA90 /* ADJSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D2F23F62447DCE800B7CA90 /* ADJSubscription.m */; };
9D2F23F92447DCE800B7CA90 /* ADJSubscription.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D2F23F72447DCE800B7CA90 /* ADJSubscription.h */; settings = {ATTRIBUTES = (Public, ); }; };
9D2F23FC2447DD2500B7CA90 /* ADJSubscription.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D2F23FA2447DD2500B7CA90 /* ADJSubscription.h */; settings = {ATTRIBUTES = (Public, ); }; };
9D2F23FD2447DD2500B7CA90 /* ADJSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D2F23FB2447DD2500B7CA90 /* ADJSubscription.m */; };
9D2F24002447DD3700B7CA90 /* ADJSubscription.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D2F23FE2447DD3600B7CA90 /* ADJSubscription.h */; settings = {ATTRIBUTES = (Public, ); }; };
9D2F24012447DD3700B7CA90 /* ADJSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D2F23FF2447DD3700B7CA90 /* ADJSubscription.m */; };
9D2F24042447DD6000B7CA90 /* ADJSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D2F24022447DD6000B7CA90 /* ADJSubscription.m */; };
9D2F24052447DD6000B7CA90 /* ADJSubscription.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D2F24032447DD6000B7CA90 /* ADJSubscription.h */; settings = {ATTRIBUTES = (Public, ); }; };
9D363AC31BDA50FA00B47FE9 /* ADJLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 96E5E37318BBB48A008E7B30 /* ADJLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
9D7431EA1EB9F9B700969F14 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D7431E91EB9F9B700969F14 /* main.m */; };
9D7431ED1EB9F9B700969F14 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D7431EC1EB9F9B700969F14 /* AppDelegate.m */; };
Expand Down Expand Up @@ -806,6 +816,16 @@
9D0E2E68210B575600133B4F /* WKWebViewJavascriptBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewJavascriptBridge.h; sourceTree = "<group>"; };
9D0E2E69210B575600133B4F /* AdjustBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdjustBridge.h; sourceTree = "<group>"; };
9D0E2E6A210B575600133B4F /* AdjustBridgeRegister.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdjustBridgeRegister.m; sourceTree = "<group>"; };
9D2F23E02447CE5C00B7CA90 /* ADJSubscription.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ADJSubscription.h; sourceTree = "<group>"; };
9D2F23E12447CE5C00B7CA90 /* ADJSubscription.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ADJSubscription.m; sourceTree = "<group>"; };
9D2F23F62447DCE800B7CA90 /* ADJSubscription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJSubscription.m; sourceTree = "<group>"; };
9D2F23F72447DCE800B7CA90 /* ADJSubscription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJSubscription.h; sourceTree = "<group>"; };
9D2F23FA2447DD2500B7CA90 /* ADJSubscription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJSubscription.h; sourceTree = "<group>"; };
9D2F23FB2447DD2500B7CA90 /* ADJSubscription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJSubscription.m; sourceTree = "<group>"; };
9D2F23FE2447DD3600B7CA90 /* ADJSubscription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJSubscription.h; sourceTree = "<group>"; };
9D2F23FF2447DD3700B7CA90 /* ADJSubscription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJSubscription.m; sourceTree = "<group>"; };
9D2F24022447DD6000B7CA90 /* ADJSubscription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJSubscription.m; sourceTree = "<group>"; };
9D2F24032447DD6000B7CA90 /* ADJSubscription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJSubscription.h; sourceTree = "<group>"; };
9D449DB31E6ED23400E7E80B /* AdjustExample-iWatch.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "AdjustExample-iWatch.xcodeproj"; path = "examples/AdjustExample-iWatch/AdjustExample-iWatch.xcodeproj"; sourceTree = "<group>"; };
9D449DBF1E6ED23900E7E80B /* AdjustExample-Swift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "AdjustExample-Swift.xcodeproj"; path = "examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj"; sourceTree = "<group>"; };
9D449DC51E6ED24000E7E80B /* AdjustExample-tvOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "AdjustExample-tvOS.xcodeproj"; path = "examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1334,6 +1354,8 @@
6FCC84F71F278CF300D6A0ED /* ADJReachability.m */,
9DD0E9AC1F44690B00B2A759 /* ADJUserDefaults.h */,
9DD0E9AD1F44690B00B2A759 /* ADJUserDefaults.m */,
9D2F23E02447CE5C00B7CA90 /* ADJSubscription.h */,
9D2F23E12447CE5C00B7CA90 /* ADJSubscription.m */,
);
path = Adjust;
sourceTree = "<group>";
Expand Down Expand Up @@ -1434,6 +1456,8 @@
9D0E2E58210B575600133B4F /* ADJTimerCycle.h */,
9D0E2E59210B575600133B4F /* ADJActivityHandler.m */,
9D0E2E5A210B575600133B4F /* ADJReachability.m */,
9D2F24032447DD6000B7CA90 /* ADJSubscription.h */,
9D2F24022447DD6000B7CA90 /* ADJSubscription.m */,
);
path = Adjust;
sourceTree = SOURCE_ROOT;
Expand Down Expand Up @@ -1638,6 +1662,8 @@
9DEAF0F2210072BC005CAEDB /* ADJTimerCycle.h */,
9DEAF0F3210072BC005CAEDB /* ADJActivityHandler.m */,
9DEAF0F4210072BC005CAEDB /* ADJReachability.m */,
9D2F23FA2447DD2500B7CA90 /* ADJSubscription.h */,
9D2F23FB2447DD2500B7CA90 /* ADJSubscription.m */,
);
path = Adjust;
sourceTree = SOURCE_ROOT;
Expand Down Expand Up @@ -1717,6 +1743,8 @@
96B671131D788F4A0090A023 /* ADJSessionParameters.m */,
6FCC85021F27944600D6A0ED /* ADJReachability.h */,
6FCC85031F27944600D6A0ED /* ADJReachability.m */,
9D2F23F72447DCE800B7CA90 /* ADJSubscription.h */,
9D2F23F62447DCE800B7CA90 /* ADJSubscription.m */,
);
path = Adjust;
sourceTree = SOURCE_ROOT;
Expand Down Expand Up @@ -1816,6 +1844,8 @@
96B671171D788F7A0090A023 /* ADJSessionParameters.m */,
6FCC85071F27948700D6A0ED /* ADJReachability.h */,
6FCC85061F27948700D6A0ED /* ADJReachability.m */,
9D2F23FE2447DD3600B7CA90 /* ADJSubscription.h */,
9D2F23FF2447DD3700B7CA90 /* ADJSubscription.m */,
);
path = Adjust;
sourceTree = SOURCE_ROOT;
Expand Down Expand Up @@ -1845,6 +1875,7 @@
96BCFBD01AC9923F005A65C5 /* ADJConfig.h in Headers */,
9D363AC31BDA50FA00B47FE9 /* ADJLogger.h in Headers */,
96BCFBD11AC99246005A65C5 /* ADJAttribution.h in Headers */,
9D2F23E22447CE5C00B7CA90 /* ADJSubscription.h in Headers */,
9601CAE81C74BAAE00670879 /* ADJEventFailure.h in Headers */,
9601CAE41C74B70600670879 /* ADJEventSuccess.h in Headers */,
6FCC85011F278CF300D6A0ED /* ADJReachability.h in Headers */,
Expand Down Expand Up @@ -1890,6 +1921,7 @@
9D0E2E6B210B575600133B4F /* ADJConfig.h in Headers */,
9D0E2E8F210B575600133B4F /* ADJEvent.h in Headers */,
9D0E2E73210B575600133B4F /* ADJAttribution.h in Headers */,
9D2F24052447DD6000B7CA90 /* ADJSubscription.h in Headers */,
9D0E2EA2210B575600133B4F /* ADJEventFailure.h in Headers */,
9D0E2EA1210B575600133B4F /* ADJEventSuccess.h in Headers */,
9D0E2E9E210B575600133B4F /* ADJSessionFailure.h in Headers */,
Expand Down Expand Up @@ -1931,6 +1963,7 @@
9DEAF0F9210072BC005CAEDB /* Adjust.h in Headers */,
9DEAF0F5210072BC005CAEDB /* ADJConfig.h in Headers */,
9DEAF119210072BC005CAEDB /* ADJEvent.h in Headers */,
9D2F23FC2447DD2500B7CA90 /* ADJSubscription.h in Headers */,
9DEAF0FD210072BC005CAEDB /* ADJAttribution.h in Headers */,
9DEAF12E210072BC005CAEDB /* ADJSessionSuccess.h in Headers */,
9DEAF128210072BC005CAEDB /* ADJSessionFailure.h in Headers */,
Expand Down Expand Up @@ -1973,6 +2006,7 @@
9DF9C91F1D6F3CA5008E362F /* ADJConfig.h in Headers */,
9DF9C92B1D6F3CA5008E362F /* ADJLogger.h in Headers */,
9DF9C9191D6F3CA5008E362F /* ADJAttribution.h in Headers */,
9D2F23F92447DCE800B7CA90 /* ADJSubscription.h in Headers */,
9DF9C9251D6F3CA5008E362F /* ADJEventFailure.h in Headers */,
9DF9C9271D6F3CA5008E362F /* ADJEventSuccess.h in Headers */,
9DF9C9371D6F3CA5008E362F /* ADJSessionFailure.h in Headers */,
Expand Down Expand Up @@ -2014,6 +2048,7 @@
9DFB06701D7470C0006D48FC /* ADJConfig.h in Headers */,
9DFB067C1D7470C0006D48FC /* ADJLogger.h in Headers */,
9DFB066A1D7470C0006D48FC /* ADJAttribution.h in Headers */,
9D2F24002447DD3700B7CA90 /* ADJSubscription.h in Headers */,
9DFB06761D7470C0006D48FC /* ADJEventFailure.h in Headers */,
9DFB06781D7470C0006D48FC /* ADJEventSuccess.h in Headers */,
9DFB06881D7470C0006D48FC /* ADJSessionFailure.h in Headers */,
Expand Down Expand Up @@ -2197,7 +2232,7 @@
9679920518BBAE2800394606 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1140;
LastUpgradeCheck = 1150;
ORGANIZATIONNAME = "adjust GmbH";
TargetAttributes = {
9615158E1CD2CB2C0022D336 = {
Expand Down Expand Up @@ -2528,6 +2563,7 @@
96E5E39418BBB48A008E7B30 /* ADJPackageBuilder.m in Sources */,
6FCC85001F278CF300D6A0ED /* ADJReachability.m in Sources */,
96E5E39618BBB48A008E7B30 /* ADJRequestHandler.m in Sources */,
9D2F23E32447CE5C00B7CA90 /* ADJSubscription.m in Sources */,
96E5E39918BBB48A008E7B30 /* ADJUtil.m in Sources */,
9609BC6A19EEA55800E02303 /* ADJEvent.m in Sources */,
965307F61A000DA400107FF9 /* ADJDeviceInfo.m in Sources */,
Expand Down Expand Up @@ -2614,6 +2650,7 @@
9D0E2E6D210B575600133B4F /* ADJTimerOnce.m in Sources */,
9D0E2E77210B575600133B4F /* ADJEvent.m in Sources */,
9D0E2E8D210B575600133B4F /* ADJConfig.m in Sources */,
9D2F24042447DD6000B7CA90 /* ADJSubscription.m in Sources */,
9D0E2E6E210B575600133B4F /* ADJAttributionHandler.m in Sources */,
9D0E2E87210B575600133B4F /* ADJBackoffStrategy.m in Sources */,
9D0E2EBB210B575600133B4F /* AdjustBridgeRegister.m in Sources */,
Expand Down Expand Up @@ -2657,6 +2694,7 @@
9DEAF10A210072BC005CAEDB /* ADJSessionFailure.m in Sources */,
9DEAF121210072BC005CAEDB /* UIDevice+ADJAdditions.m in Sources */,
9DEAF105210072BC005CAEDB /* ADJSessionSuccess.m in Sources */,
9D2F23FD2447DD2500B7CA90 /* ADJSubscription.m in Sources */,
9DEAF124210072BC005CAEDB /* ADJSystemProfile.m in Sources */,
9DEAF0FB210072BC005CAEDB /* ADJRequestHandler.m in Sources */,
9DEAF11B210072BC005CAEDB /* ADJActivityKind.m in Sources */,
Expand Down Expand Up @@ -2697,6 +2735,7 @@
9DF9C92E1D6F3CA5008E362F /* ADJPackageBuilder.m in Sources */,
9DF9C9301D6F3CA5008E362F /* ADJPackageHandler.m in Sources */,
6FCC85051F27946100D6A0ED /* ADJReachability.m in Sources */,
9D2F23F82447DCE800B7CA90 /* ADJSubscription.m in Sources */,
9DF9C9321D6F3CA5008E362F /* ADJRequestHandler.m in Sources */,
9DF9C9461D6F3CA5008E362F /* ADJUtil.m in Sources */,
9DF9C9241D6F3CA5008E362F /* ADJEvent.m in Sources */,
Expand Down Expand Up @@ -2737,6 +2776,7 @@
9DFB067F1D7470C0006D48FC /* ADJPackageBuilder.m in Sources */,
9DFB06811D7470C0006D48FC /* ADJPackageHandler.m in Sources */,
6FCC85091F27949000D6A0ED /* ADJReachability.m in Sources */,
9D2F24012447DD3700B7CA90 /* ADJSubscription.m in Sources */,
9DFB06831D7470C0006D48FC /* ADJRequestHandler.m in Sources */,
9DFB06971D7470C0006D48FC /* ADJUtil.m in Sources */,
9DFB06751D7470C0006D48FC /* ADJEvent.m in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
10 changes: 4 additions & 6 deletions Adjust/ADJActivityHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@
@property (nonatomic, copy) NSData *deviceTokenData;
@property (nonatomic, copy) NSNumber *enabled;
@property (nonatomic, assign) BOOL offline;
@property (nonatomic, copy) NSString *basePath;
@property (nonatomic, copy) NSString *gdprPath;
@property (nonatomic, copy) NSString *extraPath;

- (id)init;

Expand Down Expand Up @@ -97,8 +96,7 @@
- (void)resetSessionPartnerParameters;
- (void)trackAdRevenue:(NSString *)soruce payload:(NSData *)payload;
- (void)disableThirdPartySharing;
- (NSString *)getBasePath;
- (NSString *)getGdprPath;
- (void)trackSubscription:(ADJSubscription *)subscription;

- (ADJDeviceInfo *)deviceInfo;
- (ADJActivityState *)activityState;
Expand All @@ -111,8 +109,8 @@

@interface ADJActivityHandler : NSObject <ADJActivityHandler>

+ (id<ADJActivityHandler>)handlerWithConfig:(ADJConfig *)adjustConfig
savedPreLaunch:(ADJSavedPreLaunch *)savedPreLaunch;
- (id)initWithConfig:(ADJConfig *)adjustConfig
savedPreLaunch:(ADJSavedPreLaunch *)savedPreLaunch;

- (void)addSessionCallbackParameterI:(ADJActivityHandler *)selfI
key:(NSString *)key
Expand Down
Loading