Merge pull request #782 from adjust/v551

Version 5.5.1

Author: uerceg

Adjust.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name                    = "Adjust"
   s.module_name             = "AdjustSdk"
-  s.version                 = "5.5.0"
+  s.version                 = "5.5.1"
   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/ADJLinkResolution.h

@@ -2,8 +2,8 @@
 //  ADJLinkResolution.h
 //  Adjust
 //
-//  Created by Pedro S. on 26.04.21.
-//  Copyright © 2021 adjust GmbH. All rights reserved.
+//  Created by Pedro Silva (@nonelse) on 26th April 2021.
+//  Copyright © 2021-Present Adjust GmbH. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

Adjust/ADJLinkResolution.m

@@ -2,11 +2,12 @@
 //  ADJLinkResolution.m
 //  Adjust
 //
-//  Created by Pedro S. on 26.04.21.
-//  Copyright © 2021 adjust GmbH. All rights reserved.
+//  Created by Pedro Silva (@nonelse) on 26th April 2021.
+//  Copyright © 2021-Present Adjust GmbH. All rights reserved.
 //
 
 #import "ADJLinkResolution.h"
+#import "ADJUtil.h"
 
 static NSUInteger kMaxRecursions = 10;
 
@@ -22,19 +23,21 @@ + (nonnull ADJLinkResolutionDelegate *)sharedInstance;
 
 + (nullable NSURL *)convertUrlToHttps:(nullable NSURL *)url;
 
++ (NSURLRequest *)replaceUrlWithRequest:(NSURLRequest *)request
+                           urlToReplace:(nonnull NSURL *)urlToReplace;
+
 @end
 
 @implementation ADJLinkResolutionDelegate
 
 - (nonnull instancetype)init {
     self = [super init];
-
     return self;
 }
 
 + (nonnull ADJLinkResolutionDelegate *)sharedInstance {
     static ADJLinkResolutionDelegate *sharedInstance = nil;
-    static dispatch_once_t onceToken; // onceToken = 0
+    static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         sharedInstance = [[self alloc] init];
     });
@@ -44,8 +47,7 @@ + (nonnull ADJLinkResolutionDelegate *)sharedInstance {
 - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task
                      willPerformHTTPRedirection:(NSHTTPURLResponse *)response
                                      newRequest:(NSURLRequest *)request
-                              completionHandler:(void (^)(NSURLRequest * _Nullable))completionHandler
-{
+                              completionHandler:(void (^)(NSURLRequest * _Nullable))completionHandler {
     // if we're already at a terminal host (adjust.com / adj.st / go.link),
     // stop auto-following to preserve the terminal URL (avoid jumping to App Store links)
     if ([ADJLinkResolution isTerminalUrlWithHost:response.URL.host]) {
@@ -55,7 +57,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task
 
     NSURL *_Nullable convertedUrl = [ADJLinkResolutionDelegate convertUrlToHttps:request.URL];
 
-    if (request.URL != nil && convertedUrl != nil && ! [request.URL isEqual:convertedUrl]) {
+    if (request.URL != nil && convertedUrl != nil && ![request.URL isEqual:convertedUrl]) {
         completionHandler([ADJLinkResolutionDelegate replaceUrlWithRequest:request
                                                               urlToReplace:convertedUrl]);
     } else {
@@ -67,24 +69,18 @@ + (nullable NSURL *)convertUrlToHttps:(nullable NSURL *)url {
     if (url == nil) {
         return nil;
     }
-
-    if (! [url.absoluteString hasPrefix:@"http:"]) {
+    if (![url.absoluteString hasPrefix:@"http:"]) {
         return url;
     }
 
     NSString *_Nonnull urlStringWithoutPrefix = [url.absoluteString substringFromIndex:5];
-
-    return [NSURL URLWithString:
-                [NSString stringWithFormat:@"https:%@", urlStringWithoutPrefix]];
+    return [NSURL URLWithString:[NSString stringWithFormat:@"https:%@", urlStringWithoutPrefix]];
 }
 
 + (NSURLRequest *)replaceUrlWithRequest:(NSURLRequest *)request
-                           urlToReplace:(nonnull NSURL *)urlToReplace
-{
+                           urlToReplace:(nonnull NSURL *)urlToReplace {
     NSMutableURLRequest *mutableRequest = [request mutableCopy];
-
     [mutableRequest setURL:urlToReplace];
-
     return [mutableRequest copy];
 }
 
@@ -94,93 +90,99 @@ @implementation ADJLinkResolution
 
 + (void)resolveLinkWithUrl:(nonnull NSURL *)url
      resolveUrlSuffixArray:(nullable NSArray<NSString *> *)resolveUrlSuffixArray
-                  callback:(nonnull void (^)(NSURL *_Nullable resolvedLink))callback
-{
+                  callback:(nonnull void (^)(NSURL *_Nullable resolvedLink))callback {
     if (callback == nil) {
         return;
     }
-
-    if (url == nil) {
-        callback(nil);
+    if (url == nil || url.host == nil || url.host.length == 0) {
+        [ADJUtil launchInMainThread:^{
+            callback(url);
+        }];
         return;
     }
 
-    if (! [ADJLinkResolution urlMatchesSuffixWithHost:url.host
-                                          suffixArray:resolveUrlSuffixArray])
-    {
-        callback(url);
+    // if suffix array is provided and URL doesn't match, return URL unchanged
+    if (![ADJLinkResolution urlMatchesSuffixWithHost:url.host
+                                         suffixArray:resolveUrlSuffixArray]) {
+        [ADJUtil launchInMainThread:^{
+            callback(url);
+        }];
         return;
     }
 
-    ADJLinkResolutionDelegate *_Nonnull linkResolutionDelegate =
-        [ADJLinkResolutionDelegate sharedInstance];
+    ADJLinkResolutionDelegate *_Nonnull linkResolutionDelegate = [ADJLinkResolutionDelegate sharedInstance];
 
-    NSURLSession *_Nonnull session =
-        [NSURLSession
-            sessionWithConfiguration:NSURLSessionConfiguration.defaultSessionConfiguration
-            delegate:linkResolutionDelegate
-            delegateQueue:nil];
+    // reuse shared session for better performance
+    static NSURLSession *sharedSession = nil;
+    static dispatch_once_t sessionOnceToken;
+    dispatch_once(&sessionOnceToken, ^{
+        sharedSession =
+        [NSURLSession sessionWithConfiguration:NSURLSessionConfiguration.defaultSessionConfiguration
+                                      delegate:linkResolutionDelegate
+                                 delegateQueue:nil];
+    });
 
     NSURL *_Nullable httpsUrl = [ADJLinkResolutionDelegate convertUrlToHttps:url];
-
-    NSURLSessionDataTask *task =
-        [session
-            dataTaskWithURL:httpsUrl
-            completionHandler:
-                ^(NSData * _Nullable data,
-                  NSURLResponse * _Nullable response,
-                  NSError * _Nullable error)
-            {
-                // bootstrap the recursion of resolving the link
-                [ADJLinkResolution
-                    resolveLinkWithResponseUrl:response != nil ? response.URL : nil
-                    previousUrl:httpsUrl
-                    recursionNumber:0
-                    session:session
-                    callback:callback];
-            }];
+    NSURLSessionDataTask *task = [sharedSession dataTaskWithURL:httpsUrl
+                                              completionHandler:^(NSData * _Nullable data,
+                                                                  NSURLResponse * _Nullable response,
+                                                                  NSError * _Nullable error) {
+        // bootstrap the recursion of resolving the link
+        [ADJLinkResolution resolveLinkWithResponseUrl:response != nil ? response.URL : nil
+                                          previousUrl:httpsUrl
+                                      recursionNumber:0
+                                              session:sharedSession
+                                             callback:callback];
+    }];
     [task resume];
 }
 
 + (void)resolveLinkWithResponseUrl:(nullable NSURL *)responseUrl
                        previousUrl:(nullable NSURL *)previousUrl
                    recursionNumber:(NSUInteger)recursionNumber
                            session:(nonnull NSURLSession *)session
-                          callback:(nonnull void (^)(NSURL *_Nullable resolvedLink))callback
-{
+                          callback:(nonnull void (^)(NSURL *_Nullable resolvedLink))callback {
     // return (possible nil) previous url when the current one does not exist
     if (responseUrl == nil) {
-        callback(previousUrl);
+        [ADJUtil launchInMainThread:^{
+            callback(previousUrl);
+        }];
         return;
     }
-
-    // return found url with expected host
+    // stop recursion when URL stops changing (prevents infinite loops)
+    if (previousUrl != nil && [responseUrl isEqual:previousUrl]) {
+        [ADJUtil launchInMainThread:^{
+            callback(responseUrl);
+        }];
+        return;
+    }
+    // return found url with expected host (Adjust terminal domains)
+    // these are domains where we stop to avoid redirecting to App Store
     if ([ADJLinkResolution isTerminalUrlWithHost:responseUrl.host]) {
-        callback(responseUrl);
+        [ADJUtil launchInMainThread:^{
+            callback(responseUrl);
+        }];
         return;
     }
-
-    // return previous (non-nil) url when it reached the max number of recursive tries
+    // return current url when it reached the max number of recursive tries
     if (recursionNumber >= kMaxRecursions) {
-        callback(responseUrl);
+        [ADJUtil launchInMainThread:^{
+            callback(responseUrl);
+        }];
         return;
     }
 
     // when found a non expected url host, use it to recursively resolve the link
-    NSURLSessionDataTask *task =
-        [session
-            dataTaskWithURL:responseUrl
-            completionHandler:
-                ^(NSData * _Nullable data,
-                  NSURLResponse * _Nullable response,
-                  NSError * _Nullable error)
-         {
-            [ADJLinkResolution resolveLinkWithResponseUrl:response != nil ? response.URL : nil
-                                              previousUrl:responseUrl
-                                          recursionNumber:(recursionNumber + 1)
-                                                  session:session
-                                                 callback:callback];
-        }];
+    NSURLSessionDataTask *task = [session dataTaskWithURL:responseUrl
+                                        completionHandler:^(NSData * _Nullable data,
+                                                            NSURLResponse * _Nullable response,
+                                                            NSError * _Nullable error) {
+        [ADJLinkResolution resolveLinkWithResponseUrl:response != nil ? response.URL : nil
+                                          previousUrl:responseUrl
+                                      recursionNumber:(recursionNumber + 1)
+                                              session:session
+                                             callback:callback];
+    }];
     [task resume];
 }
 
@@ -189,16 +191,22 @@ + (BOOL)isTerminalUrlWithHost:(nullable NSString *)urlHost {
         return NO;
     }
 
-    NSArray<NSString *> *_Nonnull terminalUrlHostSuffixArray =
-        @[@"adjust.com", @"adj.st", @"go.link", @"adjust.cn", @"adjust.net.in", @"adjust.world", @"adjust.io"];
+    // check hardcoded Adjust terminal domains
+    // these are domains where we stop recursion to avoid redirecting to App Store
+    NSArray<NSString *> *_Nonnull terminalUrlHostSuffixArray = @[@"adjust.com",
+                                                                 @"adj.st",
+                                                                 @"go.link",
+                                                                 @"adjust.cn",
+                                                                 @"adjust.net.in",
+                                                                 @"adjust.world",
+                                                                 @"adjust.io"];
 
     return [ADJLinkResolution urlMatchesSuffixWithHost:urlHost
                                            suffixArray:terminalUrlHostSuffixArray];
 }
 
 + (BOOL)urlMatchesSuffixWithHost:(nullable NSString *)urlHost
-                     suffixArray:(nullable NSArray<NSString *> *)suffixArray
-{
+                     suffixArray:(nullable NSArray<NSString *> *)suffixArray {
     if (urlHost == nil) {
         return NO;
     }

Adjust/ADJLogger.m

@@ -7,6 +7,7 @@
 //
 
 #import "ADJLogger.h"
+#import <os/log.h>
 
 static NSString * const kLogTag = @"Adjust";
 
@@ -15,6 +16,7 @@ @interface ADJLogger()
 @property (nonatomic, assign) ADJLogLevel loglevel;
 @property (nonatomic, assign) BOOL logLevelLocked;
 @property (nonatomic, assign) BOOL isProductionEnvironment;
+@property (nonatomic, strong) os_log_t osLogLogger;
 
 @end
 
@@ -29,6 +31,7 @@ - (id)init {
     _loglevel = ADJLogLevelInfo;
     self.logLevelLocked = NO;
     self.isProductionEnvironment = NO;
+    self.osLogLogger = os_log_create("com.adjust.sdk", "Adjust");
 
     return self;
 }
@@ -100,8 +103,18 @@ - (void)logLevel:(NSString *)logLevel format:(NSString *)format parameters:(va_l
     va_end(parameters);
 
     NSArray *lines = [string componentsSeparatedByString:@"\n"];
+
+    os_log_type_t osLogType = OS_LOG_TYPE_DEFAULT;
+    if ([logLevel isEqualToString:@"e"] || [logLevel isEqualToString:@"w"]) {
+        osLogType = OS_LOG_TYPE_ERROR;
+    } else if ([logLevel isEqualToString:@"a"]) {
+        osLogType = OS_LOG_TYPE_FAULT;
+    }
+
     for (NSString *line in lines) {
-        NSLog(@"\t[%@]%@: %@", kLogTag, logLevel, line);
+        os_log_with_type(self.osLogLogger, osLogType,
+                         "\t[%{public}@]%{public}@: %{public}@",
+                         kLogTag, logLevel, line);
     }
 }
 

Adjust/Adjust.h

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

Adjust/Internal/ADJActivityHandler.h

@@ -67,10 +67,12 @@
 @end
 
 @class ADJTrackingStatusManager;
+@class ADJAdServicesManager;
 
 @protocol ADJActivityHandler <NSObject>
 
 @property (nonatomic, strong) ADJTrackingStatusManager * _Nullable trackingStatusManager;
+@property (nonatomic, strong) ADJAdServicesManager * _Nullable adServicesManager;
 
 - (id _Nullable)initWithConfig:(ADJConfig *_Nullable)adjustConfig
                 savedPreLaunch:(ADJSavedPreLaunch * _Nullable)savedPreLaunch
@@ -103,8 +105,7 @@
 
 - (BOOL)updateAttributionI:(id<ADJActivityHandler> _Nullable)selfI
                attribution:(ADJAttribution * _Nullable)attribution;
-- (void)setAdServicesAttributionToken:(NSString * _Nullable)token
-                                error:(NSError * _Nullable)error;
+- (void)forceRecheckAdServicesAttribution;
 
 - (void)setOfflineMode:(BOOL)offline;
 
@@ -199,6 +200,14 @@
 
 @end
 
+@interface ADJAdServicesManager : NSObject
+
+- (instancetype _Nullable)initWithActivityHandler:(ADJActivityHandler * _Nullable)activityHandler;
+- (void)checkForAdServicesAttribution;
+- (void)forceRecheckAdServicesAttribution;
+
+@end
+
 extern NSString * _Nullable const ADJClickSourceAdServices;
 extern NSString * _Nullable const ADJClickSourceGoogleOdm;