Merge pull request #680 from adjust/v4351

Version 4.35.1
adjust · Oct 2, 2023 · 9abd400 · 9abd400
2 parents f90ae6c + 877bc75
commit 9abd400
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 105 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.35.0"
+  s.version        = "4.35.1"
   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         = { "Adjust" => "[email protected]" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.35.0" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.35.1" }
   s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

diff --git a/Adjust/ADJPackageBuilder.m b/Adjust/ADJPackageBuilder.m
@@ -69,8 +69,6 @@ - (ADJActivityPackage *)buildSessionPackage:(BOOL)isInDelay {
     sessionPackage.activityKind = ADJActivityKindSession;
     sessionPackage.suffix = @"";
     sessionPackage.parameters = parameters;
-
-    [self signWithSigV2Plugin:sessionPackage];
     sessionPackage.parameters = [ADJUtil deepCopyOfDictionary:sessionPackage.parameters];
 
     return sessionPackage;
@@ -84,13 +82,10 @@ - (ADJActivityPackage *)buildEventPackage:(ADJEvent *)event
     eventPackage.activityKind = ADJActivityKindEvent;
     eventPackage.suffix = [self eventSuffix:event];
     eventPackage.parameters = parameters;
-
     if (isInDelay) {
         eventPackage.callbackParameters = [ADJUtil deepCopyOfDictionary:event.callbackParameters];
         eventPackage.partnerParameters = [ADJUtil deepCopyOfDictionary:event.partnerParameters];
     }
-
-    [self signWithSigV2Plugin:eventPackage];
     eventPackage.parameters = [ADJUtil deepCopyOfDictionary:eventPackage.parameters];
 
     return eventPackage;
@@ -103,8 +98,6 @@ - (ADJActivityPackage *)buildInfoPackage:(NSString *)infoSource {
     infoPackage.activityKind = ADJActivityKindInfo;
     infoPackage.suffix = @"";
     infoPackage.parameters = parameters;
-
-    [self signWithSigV2Plugin:infoPackage];
     infoPackage.parameters = [ADJUtil deepCopyOfDictionary:infoPackage.parameters];
 
     return infoPackage;
@@ -117,8 +110,6 @@ - (ADJActivityPackage *)buildAdRevenuePackage:(NSString *)source payload:(NSData
     adRevenuePackage.activityKind = ADJActivityKindAdRevenue;
     adRevenuePackage.suffix = @"";
     adRevenuePackage.parameters = parameters;
-
-    [self signWithSigV2Plugin:adRevenuePackage];
     adRevenuePackage.parameters = [ADJUtil deepCopyOfDictionary:adRevenuePackage.parameters];
 
     return adRevenuePackage;
@@ -131,13 +122,10 @@ - (ADJActivityPackage *)buildAdRevenuePackage:(ADJAdRevenue *)adRevenue isInDela
     adRevenuePackage.activityKind = ADJActivityKindAdRevenue;
     adRevenuePackage.suffix = @"";
     adRevenuePackage.parameters = parameters;
-
     if (isInDelay) {
         adRevenuePackage.callbackParameters = [ADJUtil deepCopyOfDictionary:adRevenue.callbackParameters];
         adRevenuePackage.partnerParameters = [ADJUtil deepCopyOfDictionary:adRevenue.partnerParameters];
     }
-
-    [self signWithSigV2Plugin:adRevenuePackage];
     adRevenuePackage.parameters = [ADJUtil deepCopyOfDictionary:adRevenuePackage.parameters];
 
     return adRevenuePackage;
@@ -154,8 +142,6 @@ - (ADJActivityPackage *)buildClickPackage:(NSString *)clickSource extraParameter
     clickPackage.activityKind = ADJActivityKindClick;
     clickPackage.suffix = @"";
     clickPackage.parameters = parameters;
-
-    [self signWithSigV2Plugin:clickPackage];
     clickPackage.parameters = [ADJUtil deepCopyOfDictionary:clickPackage.parameters];
 
     return clickPackage;
@@ -168,8 +154,6 @@ - (ADJActivityPackage *)buildAttributionPackage:(NSString *)initiatedBy {
     attributionPackage.activityKind = ADJActivityKindAttribution;
     attributionPackage.suffix = @"";
     attributionPackage.parameters = parameters;
-
-    [self signWithSigV2Plugin:attributionPackage];
     attributionPackage.parameters = [ADJUtil deepCopyOfDictionary:attributionPackage.parameters];
 
     return attributionPackage;
@@ -182,8 +166,6 @@ - (ADJActivityPackage *)buildGdprPackage {
     gdprPackage.activityKind = ADJActivityKindGdpr;
     gdprPackage.suffix = @"";
     gdprPackage.parameters = parameters;
-
-    [self signWithSigV2Plugin:gdprPackage];
     gdprPackage.parameters = [ADJUtil deepCopyOfDictionary:gdprPackage.parameters];
 
     return gdprPackage;
@@ -196,8 +178,6 @@ - (ADJActivityPackage *)buildDisableThirdPartySharingPackage {
     dtpsPackage.activityKind = ADJActivityKindDisableThirdPartySharing;
     dtpsPackage.suffix = @"";
     dtpsPackage.parameters = parameters;
-
-    [self signWithSigV2Plugin:dtpsPackage];
     dtpsPackage.parameters = [ADJUtil deepCopyOfDictionary:dtpsPackage.parameters];
 
     return dtpsPackage;
@@ -211,8 +191,6 @@ - (ADJActivityPackage *)buildThirdPartySharingPackage:(nonnull ADJThirdPartyShar
     tpsPackage.activityKind = ADJActivityKindThirdPartySharing;
     tpsPackage.suffix = @"";
     tpsPackage.parameters = parameters;
-
-    [self signWithSigV2Plugin:tpsPackage];
     tpsPackage.parameters = [ADJUtil deepCopyOfDictionary:tpsPackage.parameters];
 
     return tpsPackage;
@@ -225,8 +203,6 @@ - (ADJActivityPackage *)buildMeasurementConsentPackage:(BOOL)enabled {
     mcPackage.activityKind = ADJActivityKindMeasurementConsent;
     mcPackage.suffix = @"";
     mcPackage.parameters = parameters;
-
-    [self signWithSigV2Plugin:mcPackage];
     mcPackage.parameters = [ADJUtil deepCopyOfDictionary:mcPackage.parameters];
 
     return mcPackage;
@@ -240,13 +216,10 @@ - (ADJActivityPackage *)buildSubscriptionPackage:(ADJSubscription *)subscription
     subscriptionPackage.activityKind = ADJActivityKindSubscription;
     subscriptionPackage.suffix = @"";
     subscriptionPackage.parameters = parameters;
-
     if (isInDelay) {
         subscriptionPackage.callbackParameters = [ADJUtil deepCopyOfDictionary:subscription.callbackParameters];
         subscriptionPackage.partnerParameters = [ADJUtil deepCopyOfDictionary:subscription.partnerParameters];
     }
-
-    [self signWithSigV2Plugin:subscriptionPackage];
     subscriptionPackage.parameters = [ADJUtil deepCopyOfDictionary:subscriptionPackage.parameters];
 
     return subscriptionPackage;
@@ -263,8 +236,6 @@ - (ADJActivityPackage *)buildPurchaseVerificationPackageWithExtraParams:(NSDicti
     purchaseVerificationPackage.activityKind = ADJActivityKindPurchaseVerification;
     purchaseVerificationPackage.suffix = @"";
     purchaseVerificationPackage.parameters = parameters;
-
-    [self signWithSigV2Plugin:purchaseVerificationPackage];
     purchaseVerificationPackage.parameters = [ADJUtil deepCopyOfDictionary:purchaseVerificationPackage.parameters];
 
     return purchaseVerificationPackage;
@@ -350,71 +321,6 @@ + (void)parameters:(NSMutableDictionary *)parameters setString:(NSString *)value
 
 #pragma mark - Private & helper methods
 
-- (void)signWithSigV2Plugin:(ADJActivityPackage *)activityPackage {
-    Class signerClass = NSClassFromString(@"ADJSigner");
-    if (signerClass == nil) {
-        return;
-    }
-    SEL signSEL = NSSelectorFromString(@"sign:withActivityKind:withSdkVersion:");
-    if (![signerClass respondsToSelector:signSEL]) {
-        return;
-    }
-
-    NSMutableDictionary *parameters = activityPackage.parameters;
-    const char *activityKindChar = [[ADJActivityKindUtil activityKindToString:activityPackage.activityKind] UTF8String];
-    const char *sdkVersionChar = [activityPackage.clientSdk UTF8String];
-
-    // Stack allocated strings to ensure their lifetime stays until the next iteration
-    static char activityKind[64], sdkVersion[64];
-    strncpy(activityKind, activityKindChar, strlen(activityKindChar) + 1);
-    strncpy(sdkVersion, sdkVersionChar, strlen(sdkVersionChar) + 1);
-
-    // NSInvocation setArgument requires lvalue references with exact matching types to the executed function signature.
-    // With this usage we ensure that the lifetime of the object remains until the next iteration, as it points to the
-    // stack allocated string where we copied the buffer.
-    const char *lvalActivityKind = activityKind;
-    const char *lvalSdkVersion = sdkVersion;
-
-    /*
-     [ADJSigner sign:parameters
-    withActivityKind:activityKindChar
-      withSdkVersion:sdkVersionChar];
-     */
-
-    NSMethodSignature *signMethodSignature = [signerClass methodSignatureForSelector:signSEL];
-    NSInvocation *signInvocation = [NSInvocation invocationWithMethodSignature:signMethodSignature];
-    [signInvocation setSelector:signSEL];
-    [signInvocation setTarget:signerClass];
-
-    [signInvocation setArgument:&parameters atIndex:2];
-    [signInvocation setArgument:&lvalActivityKind atIndex:3];
-    [signInvocation setArgument:&lvalSdkVersion atIndex:4];
-
-    [signInvocation invoke];
-
-    SEL getVersionSEL = NSSelectorFromString(@"getVersion");
-    if (![signerClass respondsToSelector:getVersionSEL]) {
-        return;
-    }
-    /*
-     NSString *signerVersion = [ADJSigner getVersion];
-     */
-    IMP getVersionIMP = [signerClass methodForSelector:getVersionSEL];
-    if (!getVersionIMP) {
-        return;
-    }
-    id (*getVersionFunc)(id, SEL) = (void *)getVersionIMP;
-    id signerVersion = getVersionFunc(signerClass, getVersionSEL);
-    if (![signerVersion isKindOfClass:[NSString class]]) {
-        return;
-    }
-
-    NSString *signerVersionString = (NSString *)signerVersion;
-    [ADJPackageBuilder parameters:parameters
-                           setString:signerVersionString
-                           forKey:@"native_version"];
-}
-
 - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay {
     NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
 

diff --git a/Adjust/ADJRequestHandler.m b/Adjust/ADJRequestHandler.m
@@ -71,6 +71,7 @@ - (id)initWithResponseCallback:(id<ADJResponseCallback>)responseCallback
 - (void)sendPackageByPOST:(ADJActivityPackage *)activityPackage
         sendingParameters:(NSDictionary *)sendingParameters
 {
+    [self signWithSigV2Plugin:activityPackage];
     NSDictionary *parameters = [[NSDictionary alloc]
                                 initWithDictionary:activityPackage.parameters
                                 copyItems:YES];
@@ -103,6 +104,7 @@ - (void)sendPackageByPOST:(ADJActivityPackage *)activityPackage
 - (void)sendPackageByGET:(ADJActivityPackage *)activityPackage
        sendingParameters:(NSDictionary *)sendingParameters
 {
+    [self signWithSigV2Plugin:activityPackage];
     NSDictionary *parameters = [[NSDictionary alloc]
                                 initWithDictionary:activityPackage.parameters
                                 copyItems:YES];
@@ -647,4 +649,69 @@ - (NSDictionary *)buildJsonDict:(NSData *)jsonData
     return jsonDict;
 }
 
+- (void)signWithSigV2Plugin:(ADJActivityPackage *)activityPackage {
+    Class signerClass = NSClassFromString(@"ADJSigner");
+    if (signerClass == nil) {
+        return;
+    }
+    SEL signSEL = NSSelectorFromString(@"sign:withActivityKind:withSdkVersion:");
+    if (![signerClass respondsToSelector:signSEL]) {
+        return;
+    }
+
+    NSMutableDictionary *parameters = activityPackage.parameters;
+    const char *activityKindChar = [[ADJActivityKindUtil activityKindToString:activityPackage.activityKind] UTF8String];
+    const char *sdkVersionChar = [activityPackage.clientSdk UTF8String];
+
+    // Stack allocated strings to ensure their lifetime stays until the next iteration
+    static char activityKind[64], sdkVersion[64];
+    strncpy(activityKind, activityKindChar, strlen(activityKindChar) + 1);
+    strncpy(sdkVersion, sdkVersionChar, strlen(sdkVersionChar) + 1);
+
+    // NSInvocation setArgument requires lvalue references with exact matching types to the executed function signature.
+    // With this usage we ensure that the lifetime of the object remains until the next iteration, as it points to the
+    // stack allocated string where we copied the buffer.
+    const char *lvalActivityKind = activityKind;
+    const char *lvalSdkVersion = sdkVersion;
+
+    /*
+     [ADJSigner sign:parameters
+    withActivityKind:activityKindChar
+      withSdkVersion:sdkVersionChar];
+     */
+
+    NSMethodSignature *signMethodSignature = [signerClass methodSignatureForSelector:signSEL];
+    NSInvocation *signInvocation = [NSInvocation invocationWithMethodSignature:signMethodSignature];
+    [signInvocation setSelector:signSEL];
+    [signInvocation setTarget:signerClass];
+
+    [signInvocation setArgument:&parameters atIndex:2];
+    [signInvocation setArgument:&lvalActivityKind atIndex:3];
+    [signInvocation setArgument:&lvalSdkVersion atIndex:4];
+
+    [signInvocation invoke];
+
+    SEL getVersionSEL = NSSelectorFromString(@"getVersion");
+    if (![signerClass respondsToSelector:getVersionSEL]) {
+        return;
+    }
+    /*
+     NSString *signerVersion = [ADJSigner getVersion];
+     */
+    IMP getVersionIMP = [signerClass methodForSelector:getVersionSEL];
+    if (!getVersionIMP) {
+        return;
+    }
+    id (*getVersionFunc)(id, SEL) = (void *)getVersionIMP;
+    id signerVersion = getVersionFunc(signerClass, getVersionSEL);
+    if (![signerVersion isKindOfClass:[NSString class]]) {
+        return;
+    }
+
+    NSString *signerVersionString = (NSString *)signerVersion;
+    [ADJPackageBuilder parameters:parameters
+                           setString:signerVersionString
+                           forKey:@"native_version"];
+}
+
 @end
diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
@@ -35,7 +35,7 @@
 static NSRegularExpression *shortUniversalLinkRegex = nil;
 static NSRegularExpression *excludedDeeplinkRegex = nil;
 
-static NSString * const kClientSdk                  = @"ios4.35.0";
+static NSString * const kClientSdk                  = @"ios4.35.1";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";

diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h
@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.35.0
+//  V4.35.1
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //

diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m
@@ -275,7 +275,7 @@ + (NSString *)adjust_js {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge4.35.0';
+                    return 'web-bridge4.35.1';
                 }
             },
             setTestOptions: function(testOptions) {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,16 @@
+### Version 4.35.1 (2nd October 2023)
+#### Fixed
+- Fixed issue with signing requests post ATT delay timer exipry.
+
+---
+
 ### Version 4.35.0 (12th September 2023)
 #### Added
 - Added support for SigV3 library. Update authorization header building logic to use `adj_signing_id`.
 
 ---
 
 ### Version 4.34.2 (6th September 2023)
-
 #### Added
 - Added more logging around ATT delay timer feature to indicate that it's activated.
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.35.0
+4.35.1
diff --git a/examples/AdjustExample-Swift/Podfile.lock b/examples/AdjustExample-Swift/Podfile.lock
@@ -1,7 +1,7 @@
 PODS:
-  - Adjust (4.35.0):
-    - Adjust/Core (= 4.35.0)
-  - Adjust/Core (4.35.0)
+  - Adjust (4.35.1):
+    - Adjust/Core (= 4.35.1)
+  - Adjust/Core (4.35.1)
 
 DEPENDENCIES:
   - Adjust (from `../../`)
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  Adjust: e633c0cb917deeb2b00ac45bf9a4f34e6ece9477
+  Adjust: 63c56c81b420738f927fbc19e5cf4f34fd39d572
 
 PODFILE CHECKSUM: 4c79da456db9adb90cdd42adc7f721c7bb6490cd