Merge pull request #560 from adjust/v4294

Version 4.29.4
adjust · Aug 9, 2021 · 5ae9648 · 5ae9648
2 parents cd1c316 + f7a9fb6
commit 5ae9648
Show file tree

Hide file tree

Showing 31 changed files with 551 additions and 121 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.29.3"
+  s.version        = "4.29.4"
   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.29.3" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.29.4" }
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

diff --git a/Adjust/ADJActivityHandler.m b/Adjust/ADJActivityHandler.m
@@ -102,6 +102,9 @@ @interface ADJActivityHandler()
 @property (nonatomic, copy) NSString* gdprPath;
 @property (nonatomic, copy) NSString* subscriptionPath;
 
+- (void)prepareDeeplinkI:(ADJActivityHandler *_Nullable)selfI
+            responseData:(ADJAttributionResponseData *_Nullable)attributionResponseData NS_EXTENSION_UNAVAILABLE_IOS("");
+
 @end
 
 // copy from ADClientError
@@ -1764,6 +1767,9 @@ - (BOOL)shouldFetchAdServicesI:(ADJActivityHandler *)selfI {
     }
 
     // Fetch if no attribution OR not sent to backend yet
+    if ([ADJUserDefaults getAdServicesTracked]) {
+        [selfI.logger debug:@"AdServices attribution info already read"];
+    }
     return (selfI.attribution == nil || ![ADJUserDefaults getAdServicesTracked]);
 }
 
@@ -2736,7 +2742,7 @@ - (void)registerForSKAdNetworkAttribution {
 
     Class skAdNetwork = NSClassFromString(@"SKAdNetwork");
     if (skAdNetwork == nil) {
-        [logger warn:@"StoreKit framework not found in user's app (SKAdNetwork not found)"];
+        [logger warn:@"StoreKit framework not found in the app (SKAdNetwork not found)"];
         return;
     }
 

diff --git a/Adjust/ADJActivityState.m b/Adjust/ADJActivityState.m
@@ -83,7 +83,6 @@ - (BOOL)findTransactionId:(NSString *)transactionId {
 #pragma mark - Private & helper methods
 
 - (void)assignRandomToken:(NSString *)randomToken {
-    // self.secondaryDedupeToken = [[NSUUID UUID] UUIDString];
     NSString *persistedDedupeToken = [ADJUtil getPersistedRandomToken];
     if (persistedDedupeToken != nil) {
         if ((bool)[[NSUUID alloc] initWithUUIDString:persistedDedupeToken]) {

diff --git a/Adjust/ADJPackageBuilder.m b/Adjust/ADJPackageBuilder.m
@@ -6,6 +6,8 @@
 //  Copyright (c) 2013-2018 Adjust GmbH. All rights reserved.
 //
 
+#include <string.h>
+
 #import "ADJUtil.h"
 #import "ADJAttribution.h"
 #import "ADJAdjustFactory.h"
@@ -295,28 +297,40 @@ - (void)signWithSigV2Plugin:(ADJActivityPackage *)activityPackage {
     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];
+    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[51], sdkVersion[21];
+    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];
+    withActivityKind:activityKindChar
+      withSdkVersion:sdkVersionChar];
      */
+
     NSMethodSignature *signMethodSignature = [signerClass methodSignatureForSelector:signSEL];
     NSInvocation *signInvocation = [NSInvocation invocationWithMethodSignature:signMethodSignature];
-    [signInvocation setSelector: signSEL];
+    [signInvocation setSelector:signSEL];
     [signInvocation setTarget:signerClass];
 
-    [signInvocation setArgument:&parameters atIndex: 2];
-    [signInvocation setArgument:&activityKindChar atIndex: 3];
-    [signInvocation setArgument:&sdkVersionChar atIndex: 4];
+    [signInvocation setArgument:&parameters atIndex:2];
+    [signInvocation setArgument:&lvalActivityKind atIndex:3];
+    [signInvocation setArgument:&lvalSdkVersion atIndex:4];
 
     [signInvocation invoke];
 
@@ -325,17 +339,14 @@ - (void)signWithSigV2Plugin:(ADJActivityPackage *)activityPackage {
         return;
     }
     /*
-    NSString *signerVersion = [ADJSigner getVersion];
+     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;
     }
@@ -344,7 +355,6 @@ - (void)signWithSigV2Plugin:(ADJActivityPackage *)activityPackage {
     [ADJPackageBuilder parameters:parameters
                            setString:signerVersionString
                            forKey:@"native_version"];
-
 }
 
 - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay {
@@ -364,9 +374,7 @@ - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay {
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -431,9 +439,7 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADJ
     [ADJPackageBuilder parameters:parameters setString:event.eventToken forKey:@"event_token"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -518,9 +524,7 @@ - (NSMutableDictionary *)getInfoParameters:(NSString *)source {
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -589,9 +593,7 @@ - (NSMutableDictionary *)getAdRevenueParameters:(NSString *)source payload:(NSDa
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -651,9 +653,7 @@ - (NSMutableDictionary *)getAdRevenueParameters:(ADJAdRevenue *)adRevenue isInDe
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -735,9 +735,7 @@ - (NSMutableDictionary *)getClickParameters:(NSString *)source {
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -804,9 +802,7 @@ - (NSMutableDictionary *)getAttributionParameters:(NSString *)initiatedBy {
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setString:initiatedBy forKey:@"initiated_by"];
@@ -857,9 +853,7 @@ - (NSMutableDictionary *)getGdprParameters {
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -915,9 +909,7 @@ - (NSMutableDictionary *)getDisableThirdPartySharingParameters {
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -982,9 +974,7 @@ - (NSMutableDictionary *)getThirdPartySharingParameters:(nonnull ADJThirdPartySh
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -1055,9 +1045,7 @@ - (NSMutableDictionary *)getMeasurementConsentParameters:(BOOL)enabled {
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -1119,9 +1107,7 @@ - (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscripti
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
-    if (self.adjustConfig.allowIdfaReading == YES) {
-        [ADJPackageBuilder parameters:parameters setString:[ADJUtil idfa] forKey:@"idfa"];
-    }
+    [self addIdfaIfPossibleToParameters:parameters];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:self.packageParams.installedAt forKey:@"installed_at"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -1181,6 +1167,23 @@ - (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscripti
     return parameters;
 }
 
+- (void)addIdfaIfPossibleToParameters:(NSMutableDictionary *)parameters {
+    if (! self.adjustConfig.allowIdfaReading) {
+        return;
+    }
+
+    NSString *idfa = [ADJUtil idfa];
+
+    if (idfa == nil
+        || idfa.length == 0
+        || [idfa isEqualToString:@"00000000-0000-0000-0000-000000000000"])
+    {
+        return;
+    }
+
+    [ADJPackageBuilder parameters:parameters setString:idfa forKey:@"idfa"];
+}
+
 - (ADJActivityPackage *)defaultActivityPackage {
     ADJActivityPackage *activityPackage = [[ADJActivityPackage alloc] init];
     activityPackage.clientSdk = self.packageParams.clientSdk;

diff --git a/Adjust/ADJUtil.h b/Adjust/ADJUtil.h
@@ -31,13 +31,13 @@ typedef void (^isInactiveInjected)(BOOL);
 
 + (void)excludeFromBackup:(NSString *)filename;
 
-+ (void)launchDeepLinkMain:(NSURL *)deepLinkUrl;
++ (void)launchDeepLinkMain:(NSURL *)deepLinkUrl NS_EXTENSION_UNAVAILABLE_IOS("");
 
 + (void)launchInMainThread:(dispatch_block_t)block;
 
 + (BOOL)isMainThread;
 
-+ (BOOL)isInactive;
++ (BOOL)isInactive NS_EXTENSION_UNAVAILABLE_IOS("");
 
 + (void)launchInMainThreadWithInactive:(isInactiveInjected)isInactiveblock;