Skip to content

Commit 5f279f6

Browse files
nonelsenonelse
authored
Merge pull request #425 from adjust/v500_sdk2047
[SDK-2047] Integrate new SigV3 API
2 parents 69519d9 + faaef23 commit 5f279f6

File tree

18 files changed

+339
-570
lines changed

18 files changed

+339
-570
lines changed

‎Adjust/ADJAdjustFactory.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,5 @@
4444
+ (void)setAdServicesFrameworkEnabled:(BOOL)adServicesFrameworkEnabled;
4545
+ (void)setTestUrlOverwrite:(NSString *)testUrlOverwrite;
4646

47-
+ (void)enableSigning;
48-
+ (void)disableSigning;
49-
5047
+ (void)teardown:(BOOL)deleteState;
5148
@end

‎Adjust/ADJAdjustFactory.m‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -164,48 +164,6 @@ + (void)setTestUrlOverwrite:(NSString *)testUrlOverwrite {
164164
internalTestUrlOverwrite = testUrlOverwrite;
165165
}
166166

167-
+ (void)enableSigning {
168-
Class signerClass = NSClassFromString(@"ADJSigner");
169-
if (signerClass == nil) {
170-
return;
171-
}
172-
173-
SEL enabledSEL = NSSelectorFromString(@"enableSigning");
174-
if (![signerClass respondsToSelector:enabledSEL]) {
175-
return;
176-
}
177-
178-
IMP enableIMP = [signerClass methodForSelector:enabledSEL];
179-
if (!enableIMP) {
180-
return;
181-
}
182-
183-
void (*enableFunc)(id, SEL) = (void *)enableIMP;
184-
185-
enableFunc(signerClass, enabledSEL);
186-
}
187-
188-
+ (void)disableSigning {
189-
Class signerClass = NSClassFromString(@"ADJSigner");
190-
if (signerClass == nil) {
191-
return;
192-
}
193-
194-
SEL disableSEL = NSSelectorFromString(@"disableSigning");
195-
if (![signerClass respondsToSelector:disableSEL]) {
196-
return;
197-
}
198-
199-
IMP disableIMP = [signerClass methodForSelector:disableSEL];
200-
if (!disableIMP) {
201-
return;
202-
}
203-
204-
void (*disableFunc)(id, SEL) = (void *)disableIMP;
205-
206-
disableFunc(signerClass, disableSEL);
207-
}
208-
209167
+ (void)teardown:(BOOL)deleteState {
210168
if (deleteState) {
211169
[ADJActivityHandler deleteState];

‎Adjust/ADJRequestHandler.m‎

Lines changed: 95 additions & 157 deletions
Large diffs are not rendered by default.

‎Adjust/ADJUserDefaults.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,8 @@
7171

7272
+ (void)removeAttWaitingRemainingSeconds;
7373

74+
+ (void)saveControlParams:(NSDictionary *)controlParams;
75+
76+
+ (NSDictionary *)getControlParams;
7477

7578
@end

‎Adjust/ADJUserDefaults.m‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
static NSString * const PREFS_KEY_LINK_ME_CHECKED = @"adj_link_me_checked";
2121
static NSString * const PREFS_KEY_DEEPLINK_URL_CACHED = @"adj_deeplink_url_cached";
2222
static NSString * const PREFS_KEY_ATT_WAITING_REMAINING_SECONDS = @"adj_att_waiting_remaining_seconds";
23+
static NSString * const PREFS_KEY_CONTROL_PARAMS = @"adj_control_params";
2324

2425
@implementation ADJUserDefaults
2526

@@ -148,6 +149,14 @@ + (void)removeAttWaitingRemainingSeconds {
148149
[[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_ATT_WAITING_REMAINING_SECONDS];
149150
}
150151

152+
+ (void)saveControlParams:(NSDictionary *)controlParams {
153+
[[NSUserDefaults standardUserDefaults] setObject:controlParams forKey:PREFS_KEY_CONTROL_PARAMS];
154+
}
155+
156+
+ (NSDictionary *)getControlParams {
157+
return [[NSUserDefaults standardUserDefaults] dictionaryForKey:PREFS_KEY_CONTROL_PARAMS];
158+
}
159+
151160
+ (void)clearAdjustStuff {
152161
[[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_PUSH_TOKEN_DATA];
153162
[[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_PUSH_TOKEN_STRING];
@@ -161,6 +170,7 @@ + (void)clearAdjustStuff {
161170
[[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_LINK_ME_CHECKED];
162171
[[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_DEEPLINK_URL_CACHED];
163172
[[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_ATT_WAITING_REMAINING_SECONDS];
173+
[[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_CONTROL_PARAMS];
164174
}
165175

166176
@end

‎Adjust/Adjust.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ typedef void(^AdjustResolvedDeeplinkBlock)(NSString * _Nonnull resolvedLink);
3333
@property (nonatomic, assign) BOOL deleteState;
3434
@property (nonatomic, assign) BOOL noBackoffWait;
3535
@property (nonatomic, assign) BOOL adServicesFrameworkEnabled;
36-
@property (nonatomic, assign) BOOL enableSigning;
37-
@property (nonatomic, assign) BOOL disableSigning;
3836

3937
@end
4038

‎Adjust/Adjust.m‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -754,12 +754,6 @@ - (void)setTestOptions:(AdjustTestOptions *)testOptions {
754754
[ADJAdjustFactory setSdkClickHandlerBackoffStrategy:[ADJBackoffStrategy backoffStrategyWithType:ADJNoWait]];
755755
[ADJAdjustFactory setPackageHandlerBackoffStrategy:[ADJBackoffStrategy backoffStrategyWithType:ADJNoWait]];
756756
}
757-
if (testOptions.enableSigning) {
758-
[ADJAdjustFactory enableSigning];
759-
}
760-
if (testOptions.disableSigning) {
761-
[ADJAdjustFactory disableSigning];
762-
}
763757

764758
[ADJAdjustFactory setAdServicesFrameworkEnabled:testOptions.adServicesFrameworkEnabled];
765759
}

‎AdjustTests/AdjustTestApp/AdjustTestApp.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@
5151
6F3A5E8B2018CE14000AACD0 /* ADJPackageBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F3A5E652018CE14000AACD0 /* ADJPackageBuilder.m */; };
5252
6F3A5E8C2018CE14000AACD0 /* ADJUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F3A5E662018CE14000AACD0 /* ADJUserDefaults.m */; };
5353
6F3A5E8E2018CE14000AACD0 /* ADJActivityHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F3A5E6C2018CE14000AACD0 /* ADJActivityHandler.m */; };
54-
6F3A5E9E2018CE3A000AACD0 /* ATLTestInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F3A5E912018CE3A000AACD0 /* ATLTestInfo.m */; };
5554
6F3A5E9F2018CE3A000AACD0 /* ATLUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F3A5E982018CE3A000AACD0 /* ATLUtil.m */; };
56-
6F3A5EA12018CE3A000AACD0 /* ATLUtilNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F3A5E9B2018CE3A000AACD0 /* ATLUtilNetworking.m */; };
5755
6F3A5EA22018CE3A000AACD0 /* ATLTestLibrary.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F3A5E9C2018CE3A000AACD0 /* ATLTestLibrary.m */; };
5856
6F3A5EA32018CE3A000AACD0 /* ATLBlockingQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F3A5E9D2018CE3A000AACD0 /* ATLBlockingQueue.m */; };
57+
6F666C9D2C00C80A005A6D90 /* ATLNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F666C9B2C00C80A005A6D90 /* ATLNetworking.m */; };
5958
6F84510E25B1B1110004C7C0 /* ADJThirdPartySharing.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F84510C25B1B1100004C7C0 /* ADJThirdPartySharing.m */; };
6059
6FAB789F2636DD0F00773869 /* ADJLinkResolution.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FAB789E2636DD0F00773869 /* ADJLinkResolution.m */; };
6160
6FBEE92024E421B200FEF3F1 /* ADJUrlStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBEE91F24E421B200FEF3F1 /* ADJUrlStrategy.m */; };
@@ -174,17 +173,15 @@
174173
6F3A5E6A2018CE14000AACD0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
175174
6F3A5E6B2018CE14000AACD0 /* ADJTimerCycle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJTimerCycle.h; sourceTree = "<group>"; };
176175
6F3A5E6C2018CE14000AACD0 /* ADJActivityHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJActivityHandler.m; sourceTree = "<group>"; };
177-
6F3A5E912018CE3A000AACD0 /* ATLTestInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ATLTestInfo.m; sourceTree = "<group>"; };
178176
6F3A5E922018CE3A000AACD0 /* ATLUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ATLUtil.h; sourceTree = "<group>"; };
179177
6F3A5E942018CE3A000AACD0 /* ATLConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ATLConstants.h; sourceTree = "<group>"; };
180178
6F3A5E952018CE3A000AACD0 /* ATLTestLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ATLTestLibrary.h; sourceTree = "<group>"; };
181-
6F3A5E962018CE3A000AACD0 /* ATLUtilNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ATLUtilNetworking.h; sourceTree = "<group>"; };
182179
6F3A5E972018CE3A000AACD0 /* ATLBlockingQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ATLBlockingQueue.h; sourceTree = "<group>"; };
183180
6F3A5E982018CE3A000AACD0 /* ATLUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ATLUtil.m; sourceTree = "<group>"; };
184-
6F3A5E992018CE3A000AACD0 /* ATLTestInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ATLTestInfo.h; sourceTree = "<group>"; };
185-
6F3A5E9B2018CE3A000AACD0 /* ATLUtilNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ATLUtilNetworking.m; sourceTree = "<group>"; };
186181
6F3A5E9C2018CE3A000AACD0 /* ATLTestLibrary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ATLTestLibrary.m; sourceTree = "<group>"; };
187182
6F3A5E9D2018CE3A000AACD0 /* ATLBlockingQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ATLBlockingQueue.m; sourceTree = "<group>"; };
183+
6F666C9B2C00C80A005A6D90 /* ATLNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ATLNetworking.m; sourceTree = "<group>"; };
184+
6F666C9C2C00C80A005A6D90 /* ATLNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ATLNetworking.h; sourceTree = "<group>"; };
188185
6F84510C25B1B1100004C7C0 /* ADJThirdPartySharing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJThirdPartySharing.m; sourceTree = "<group>"; };
189186
6F84510D25B1B1110004C7C0 /* ADJThirdPartySharing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJThirdPartySharing.h; sourceTree = "<group>"; };
190187
6FAB789D2636DD0F00773869 /* ADJLinkResolution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJLinkResolution.h; sourceTree = "<group>"; };
@@ -407,15 +404,13 @@
407404
524BACA1221C4EE800624F6C /* PSWebSocketTypes.h */,
408405
524BAC97221C4EE700624F6C /* PSWebSocketUTF8Decoder.h */,
409406
524BACA2221C4EE800624F6C /* PSWebSocketUTF8Decoder.m */,
410-
6F3A5E912018CE3A000AACD0 /* ATLTestInfo.m */,
407+
6F666C9C2C00C80A005A6D90 /* ATLNetworking.h */,
408+
6F666C9B2C00C80A005A6D90 /* ATLNetworking.m */,
411409
6F3A5E922018CE3A000AACD0 /* ATLUtil.h */,
412410
6F3A5E942018CE3A000AACD0 /* ATLConstants.h */,
413411
6F3A5E952018CE3A000AACD0 /* ATLTestLibrary.h */,
414-
6F3A5E962018CE3A000AACD0 /* ATLUtilNetworking.h */,
415412
6F3A5E972018CE3A000AACD0 /* ATLBlockingQueue.h */,
416413
6F3A5E982018CE3A000AACD0 /* ATLUtil.m */,
417-
6F3A5E992018CE3A000AACD0 /* ATLTestInfo.h */,
418-
6F3A5E9B2018CE3A000AACD0 /* ATLUtilNetworking.m */,
419414
6F3A5E9C2018CE3A000AACD0 /* ATLTestLibrary.m */,
420415
6F3A5E9D2018CE3A000AACD0 /* ATLBlockingQueue.m */,
421416
);
@@ -548,6 +543,7 @@
548543
6FFCFE72200797D100467F01 /* ATAAdjustDelegateSessionSuccess.m in Sources */,
549544
6F3A5E7E2018CE14000AACD0 /* Adjust.m in Sources */,
550545
6FFCFE6D200797D100467F01 /* ATAAdjustDelegateAttribution.m in Sources */,
546+
6F666C9D2C00C80A005A6D90 /* ATLNetworking.m in Sources */,
551547
6F3A5E7B2018CE14000AACD0 /* ADJGlobalParameters.m in Sources */,
552548
524BACB2221D583700624F6C /* ATLControlWebSocketClient.m in Sources */,
553549
6F3A5E882018CE14000AACD0 /* ADJUtil.m in Sources */,
@@ -571,13 +567,11 @@
571567
9D75AFDB210217FF0079A36C /* ATAAdjustDelegateDeferredDeeplink.m in Sources */,
572568
6F3A5E8A2018CE14000AACD0 /* ADJResponseData.m in Sources */,
573569
6F08423A200776A000568A31 /* main.m in Sources */,
574-
6F3A5E9E2018CE3A000AACD0 /* ATLTestInfo.m in Sources */,
575570
524BACAB221C4EE800624F6C /* PSWebSocketDeflater.m in Sources */,
576571
6F3A5E802018CE14000AACD0 /* ADJPackageHandler.m in Sources */,
577572
524BACA8221C4EE800624F6C /* PSWebSocketBuffer.m in Sources */,
578573
6F3A5E792018CE14000AACD0 /* ADJSessionFailure.m in Sources */,
579574
6F3A5EA22018CE3A000AACD0 /* ATLTestLibrary.m in Sources */,
580-
6F3A5EA12018CE3A000AACD0 /* ATLUtilNetworking.m in Sources */,
581575
6F3A5E782018CE14000AACD0 /* ADJActivityState.m in Sources */,
582576
9DF38229260E9BA90033F5A1 /* NSNumber+ADJAdditions.m in Sources */,
583577
6FBEE92024E421B200FEF3F1 /* ADJUrlStrategy.m in Sources */,

‎AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -166,20 +166,6 @@ - (void)testOptions:(NSDictionary *)parameters {
166166
testOptions.adServicesFrameworkEnabled = YES;
167167
}
168168
}
169-
if ([parameters objectForKey:@"enableSigning"]) {
170-
NSString *enableSigningStr = [parameters objectForKey:@"enableSigning"][0];
171-
testOptions.enableSigning = NO;
172-
if ([enableSigningStr isEqualToString:@"true"]) {
173-
testOptions.enableSigning = YES;
174-
}
175-
}
176-
if ([parameters objectForKey:@"disableSigning"]) {
177-
NSString *disableSigningStr = [parameters objectForKey:@"disableSigning"][0];
178-
testOptions.disableSigning = NO;
179-
if ([disableSigningStr isEqualToString:@"true"]) {
180-
testOptions.disableSigning = YES;
181-
}
182-
}
183169
if ([parameters objectForKey:@"teardown"]) {
184170
NSArray *teardownOptions = [parameters objectForKey:@"teardown"];
185171
for (int i = 0; i < teardownOptions.count; i = i + 1) {

0 commit comments

Comments
 (0)