Merge pull request #754 from adjust/v520

Version 5.2.0

Author: genadyb

Adjust.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name                    = "Adjust"
   s.module_name             = "AdjustSdk"
-  s.version                 = "5.1.1"
+  s.version                 = "5.2.0"
   s.summary                 = "This is the iOS SDK of Adjust. You can read more about it at https://adjust.com."
   s.homepage                = "https://github.com/adjust/ios_sdk"
   s.license                 = { :type => 'MIT', :file => 'LICENSE' }

Adjust/ADJAttribution.h

@@ -11,7 +11,7 @@
 /**
  * @brief Adjust attribution object.
  */
-@interface ADJAttribution : NSObject <NSCoding, NSCopying>
+@interface ADJAttribution : NSObject <NSSecureCoding, NSCopying>
 
 /**
  * @brief Tracker token.

Adjust/ADJAttribution.m

@@ -12,6 +12,10 @@
 
 @implementation ADJAttribution
 
++ (BOOL)supportsSecureCoding {
+    return YES;
+}
+
 - (id)initWithJsonDict:(NSDictionary *)jsonDict {
     self = [super init];
     if (self == nil) {
@@ -170,18 +174,19 @@ - (id)initWithCoder:(NSCoder *)decoder {
         return nil;
     }
 
-    self.trackerToken = [decoder decodeObjectForKey:@"trackerToken"];
-    self.trackerName = [decoder decodeObjectForKey:@"trackerName"];
-    self.network = [decoder decodeObjectForKey:@"network"];
-    self.campaign = [decoder decodeObjectForKey:@"campaign"];
-    self.adgroup = [decoder decodeObjectForKey:@"adgroup"];
-    self.creative = [decoder decodeObjectForKey:@"creative"];
-    self.clickLabel = [decoder decodeObjectForKey:@"click_label"];
-    self.costType = [decoder decodeObjectForKey:@"costType"];
-    self.costAmount = [decoder decodeObjectForKey:@"costAmount"];
-    self.costCurrency = [decoder decodeObjectForKey:@"costCurrency"];
-    self.jsonResponse = [decoder decodeObjectForKey:@"jsonResponse"];
-
+    self.trackerToken = [decoder decodeObjectOfClass:[NSString class] forKey:@"trackerToken"];
+    self.trackerName = [decoder decodeObjectOfClass:[NSString class] forKey:@"trackerName"];
+    self.network = [decoder decodeObjectOfClass:[NSString class] forKey:@"network"];
+    self.campaign = [decoder decodeObjectOfClass:[NSString class] forKey:@"campaign"];
+    self.adgroup = [decoder decodeObjectOfClass:[NSString class] forKey:@"adgroup"];
+    self.creative = [decoder decodeObjectOfClass:[NSString class] forKey:@"creative"];
+    self.clickLabel = [decoder decodeObjectOfClass:[NSString class] forKey:@"click_label"];
+    self.costType = [decoder decodeObjectOfClass:[NSString class] forKey:@"costType"];
+    self.costAmount = [decoder decodeObjectOfClass:[NSNumber class] forKey:@"costAmount"];
+    self.costCurrency = [decoder decodeObjectOfClass:[NSString class] forKey:@"costCurrency"];
+    NSSet<Class> *allowedClasses = [NSSet setWithObjects:[NSDictionary class],
+                                    [NSString class], [NSNumber class], nil];
+    self.jsonResponse = [decoder decodeObjectOfClasses:allowedClasses forKey:@"jsonResponse"];
     return self;
 }
 

Adjust/ADJConfig.h

@@ -189,6 +189,12 @@ typedef NS_ENUM(NSUInteger, ADJLogLevel);
  */
 @property (nonatomic, readonly) BOOL isCoppaComplianceEnabled;
 
+/**
+ * @brief Indicator of whether SDK should use AppTrackingTransparency framework
+ */
+@property (nonatomic, readonly) BOOL isAppTrackingTransparencyUsageEnabled;
+
+
 #pragma mark - AdjustConfig assignable properties
 
 /**
@@ -338,6 +344,11 @@ typedef NS_ENUM(NSUInteger, ADJLogLevel);
  */
 - (void)enableCoppaCompliance;
 
+/**
+ * @brief A method to configure SDK avoid any call to AppTrackingTransparency framework.
+ */
+- (void)disableAppTrackingTransparencyUsage;
+
 /**
  * @brief A method to set custom URL strategy.
  *

Adjust/ADJConfig.m

@@ -63,6 +63,7 @@ - (nullable ADJConfig *)initWithAppToken:(nonnull NSString *)appToken
     _isDeviceIdsReadingOnceEnabled = NO;
     _isCostDataInAttributionEnabled = NO;
     _isCoppaComplianceEnabled = NO;
+    _isAppTrackingTransparencyUsageEnabled = YES;
 
     return self;
 }
@@ -113,6 +114,10 @@ - (void)enableCoppaCompliance {
     _isCoppaComplianceEnabled = YES;
 }
 
+- (void)disableAppTrackingTransparencyUsage {
+    _isAppTrackingTransparencyUsageEnabled = NO;
+}
+
 - (void)setUrlStrategy:(nullable NSArray *)urlStrategyDomains
          useSubdomains:(BOOL)useSubdomains
        isDataResidency:(BOOL)isDataResidency {
@@ -235,6 +240,7 @@ - (id)copyWithZone:(NSZone *)zone {
         copy->_isIdfvReadingEnabled = self.isIdfvReadingEnabled;
         copy->_isDeviceIdsReadingOnceEnabled = self.isDeviceIdsReadingOnceEnabled;
         copy.eventDeduplicationIdsMaxSize = self.eventDeduplicationIdsMaxSize;
+        copy->_isAppTrackingTransparencyUsageEnabled = self.isAppTrackingTransparencyUsageEnabled;
         // AdjustDelegate not copied
     }
 

Adjust/ADJDeeplink.h

@@ -10,8 +10,29 @@
 
 @interface ADJDeeplink : NSObject
 
+/**
+ * @brief Deeplink value.
+ */
 @property (nonatomic, copy, readonly, nonnull) NSURL *deeplink;
 
+/**
+ * @brief Referrer value.
+ */
+@property (nonatomic, copy, readonly, nonnull) NSURL *referrer;
+
+/**
+ * @brief Initializes a Deeplink object with the provided deeplink URL.
+ *
+ * @param deeplink The URL representing the deeplink.
+ * @return An instance of ADJDeeplink, or nil if initialization fails.
+ */
 - (nullable ADJDeeplink *)initWithDeeplink:(nonnull NSURL *)deeplink;
 
+/**
+ * @brief Sets the referrer URL for the Deeplink object.
+ *
+ * @param referrer The URL that refers the user to the deeplink, typically from an organic search.
+ */
+- (void)setReferrer:(nonnull NSURL *)referrer;
+
 @end

Adjust/ADJDeeplink.m

@@ -16,9 +16,15 @@ - (id)initWithDeeplink:(NSURL *)deeplink {
         return nil;
     }
 
-    _deeplink = deeplink;
+    _deeplink = [deeplink copy];
 
     return self;
 }
 
+- (void)setReferrer:(nonnull NSURL *)referrer {
+    @synchronized (self) {
+        _referrer = [referrer copy];
+    }
+}
+
 @end

Adjust/Adjust.h

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V5.1.1
+//  V5.2.0
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-Present Adjust GmbH. All rights reserved.
 //

Adjust/Adjust.m

@@ -287,15 +287,7 @@ + (void)verifyAppStorePurchase:(nonnull ADJAppStorePurchase *)purchase
                                withCompletionHandler:completion];
     }
 }
-/*
-+ (void)enableCoppaCompliance {
-    [[Adjust getInstance] enableCoppaCompliance];
-}
 
-+ (void)disableCoppaCompliance {
-    [[Adjust getInstance] disableCoppaCompliance];
-}
-*/
 + (void)verifyAndTrackAppStorePurchase:(nonnull ADJEvent *)event
                  withCompletionHandler:(void (^_Nonnull)(ADJPurchaseVerificationResult * _Nonnull verificationResult))completion {
     @synchronized (self) {
@@ -397,8 +389,7 @@ - (void)processDeeplink:(ADJDeeplink *)deeplink {
     [ADJUserDefaults cacheDeeplinkUrl:deeplink.deeplink];
     NSDate *clickTime = [NSDate date];
     if (![self checkActivityHandler:@"process deep link"]) {
-        [ADJUserDefaults saveDeeplinkUrl:deeplink.deeplink
-                               clickTime:clickTime];
+        [ADJUserDefaults saveDeeplink:deeplink clickTime:clickTime];
         return;
     }
     [self.activityHandler processDeeplink:deeplink withClickTime:clickTime];
@@ -415,8 +406,7 @@ - (void)processAndResolveDeeplink:(nonnull ADJDeeplink *)deeplink
     [ADJUserDefaults cacheDeeplinkUrl:deeplink.deeplink];
     NSDate *clickTime = [NSDate date];
     if (![self checkActivityHandler:@"process and resolve deep link"]) {
-        [ADJUserDefaults saveDeeplinkUrl:deeplink.deeplink
-                               clickTime:clickTime];
+        [ADJUserDefaults saveDeeplink:deeplink clickTime:clickTime];
         self.cachedResolvedDeeplinkBlock = completion;
         return;
     }
@@ -613,7 +603,7 @@ - (void)requestAppTrackingAuthorizationWithCompletionHandler:(void (^_Nullable)(
         if (![self checkActivityHandler:@"request Tracking Authorization"]) {
             return;
         }
-        [self.activityHandler updateAttStatusFromUserCallback:(int)status];
+        [self.activityHandler updateAndTrackAttStatusFromUserCallback:(int)status];
     }];
 }
 

Adjust/Internal/ADJActivityHandler.h

@@ -103,7 +103,7 @@
 - (void)trackThirdPartySharing:(nonnull ADJThirdPartySharing *)thirdPartySharing;
 - (void)trackMeasurementConsent:(BOOL)enabled;
 - (void)trackAppStoreSubscription:(ADJAppStoreSubscription * _Nullable)subscription;
-- (void)updateAttStatusFromUserCallback:(int)newAttStatusFromUser;
+- (void)updateAndTrackAttStatusFromUserCallback:(int)newAttStatusFromUser;
 - (void)trackAdRevenue:(ADJAdRevenue * _Nullable)adRevenue;
 - (void)verifyAppStorePurchase:(nonnull ADJAppStorePurchase *)purchase
          withCompletionHandler:(nonnull ADJVerificationResultBlock)completion;
@@ -144,13 +144,13 @@
 
 @interface ADJTrackingStatusManager : NSObject
 
-@property (nonatomic, readonly, assign) BOOL trackingEnabled;
-@property (nonatomic, readonly, assign) int attStatus;
-
 - (instancetype _Nullable)initWithActivityHandler:(ADJActivityHandler * _Nullable)activityHandler;
-- (void)checkForNewAttStatus;
-- (void)updateAttStatusFromUserCallback:(int)newAttStatusFromUser;
-- (BOOL)canGetAttStatus;
+- (BOOL)isAttSupported;
+- (int)attStatus;
+- (int)updateAndGetAttStatus;
+- (BOOL)isTrackingEnabled;
+- (void)updateAndTrackAttStatus;
+- (void)updateAndTrackAttStatusFromUserCallback:(int)attStatusFromUser;
 - (void)setAppInActiveState:(BOOL)activeState;
 - (BOOL)shouldWaitForAttStatus;