Merge pull request #388 from adjust/v4181

Version 4.18.1

Adjust.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.18.0"
+  s.version        = "4.18.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         = { "Christian Wellenbrock" => "[email protected]" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.18.0" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.18.1" }
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

Adjust/ADJUtil.m

@@ -40,7 +40,7 @@
 static CTTelephonyNetworkInfo *networkInfo = nil;
 #endif
 
-static NSString * const kClientSdk                  = @"ios4.18.0";
+static NSString * const kClientSdk                  = @"ios4.18.1";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";
@@ -1211,25 +1211,33 @@ + (void)launchDeepLinkMain:(NSURL *)deepLinkUrl {
         BOOL success = [sharedUIApplication openURL:deepLinkUrl];
 #pragma clang diagnostic pop
         if (!success) {
-            [ADJAdjustFactory.logger error:@"Unable to open deep link (%@)", deepLinkUrl];
+            [ADJAdjustFactory.logger error:@"Unable to open deep link without completionHandler (%@)", deepLinkUrl];
         }
     }
 #endif
 }
 
+// adapted from https://stackoverflow.com/a/9084784
 + (NSString *)convertDeviceToken:(NSData *)deviceToken {
-    if (deviceToken == nil) {
-        return nil;;
+    NSUInteger dataLength  = [deviceToken length];
+
+    if (dataLength == 0) {
+        return nil;
     }
 
-    NSString *deviceTokenString = [deviceToken.description stringByTrimmingCharactersInSet:
-                                   [NSCharacterSet characterSetWithCharactersInString:@"<>"]];
-    if (deviceTokenString == nil) {
-        return nil;;
+    const unsigned char *dataBuffer = (const unsigned char *)[deviceToken bytes];
+
+    if (!dataBuffer) {
+        return nil;
+    }
+
+    NSMutableString *hexString  = [NSMutableString stringWithCapacity:(dataLength * 2)];
+
+    for (int i = 0; i < dataLength; ++i) {
+        [hexString appendString:[NSString stringWithFormat:@"%02lx", (unsigned long)dataBuffer[i]]];
     }
 
-    deviceTokenString = [deviceTokenString stringByReplacingOccurrencesOfString:@" " withString:@""];
-    return deviceTokenString;
+    return [NSString stringWithString:hexString];
 }
 
 + (BOOL)checkAttributionDetails:(NSDictionary *)attributionDetails {

Adjust/Adjust.h

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.18.0
+//  V4.18.1
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //

AdjustBridge/AdjustBridgeRegister.m

@@ -211,7 +211,7 @@ + (NSString *)adjust_js {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge4.18.0';
+                    return 'web-bridge4.18.1';
                 }
             },
             setTestOptions: function(testOptions) {

AdjustTests/AdjustUnitTests/ADJPackageFields.m

@@ -16,7 +16,7 @@ - (id) init {
 
     // default values
     self.appToken = @"qwerty123456";
-    self.clientSdk = @"ios4.18.0";
+    self.clientSdk = @"ios4.18.1";
     self.suffix = @"";
     self.environment = @"sandbox";
 

CHANGELOG.md

@@ -1,3 +1,9 @@
+### Version 4.18.1 (2nd September 2019)
+#### Fixed
+- Fixed device token parsing to string, changed in iOS 13.
+
+---
+
 ### Version 4.18.0 (26th June 2019)
 #### Added
 - Added `trackAdRevenue:payload:` method to `Adjust` interface to allow tracking of ad revenue. With this release added support for `MoPub` ad revenue tracking.

README.md

@@ -73,13 +73,13 @@ We will describe the steps to integrate the Adjust SDK into your iOS project. We
 If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate):
 
 ```ruby
-pod 'Adjust', '~> 4.18.0'
+pod 'Adjust', '~> 4.18.1'
 ```
 
 or:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.18.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.18.1'
 ```
 
 ---

VERSION

@@ -1 +1 @@
-4.18.0
+4.18.1

doc/chinese/README.md

@@ -73,13 +73,13 @@ Read this in other languages: [English][en-readme], [中文][zh-readme], [日本
 如果您正在使用[CocoaPods][cocoapods],您可以将以下代码行添加至 `Podfile`，然后继续进行[此步骤](#sdk-integrate):
 
 ```ruby
-pod 'Adjust', '~> 4.18.0'
+pod 'Adjust', '~> 4.18.1'
 ```
 
 或:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.18.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.18.1'
 ```
 
 ---

doc/english/migrate.md

@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for iOS to v4.18.0 from v3.4.0
+## Migrate your adjust SDK for iOS to v4.18.1 from v3.4.0
 
 ### Initial setup
 

doc/english/web_view_migration.md

@@ -1,4 +1,4 @@
-## Migrate your Adjust web bridge SDK to v4.18.0 from v4.9.1 or earlier
+## Migrate your Adjust web bridge SDK to v4.18.1 from v4.9.1 or earlier
 
 ### Integration
 

doc/english/web_views.md

@@ -63,7 +63,7 @@ We will describe the steps to integrate the Adjust SDK into your iOS project. We
 If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate):
 
 ```ruby
-pod 'Adjust/WebBridge', '~> 4.18.0'
+pod 'Adjust/WebBridge', '~> 4.18.1'
 ```
 
 ---

doc/japanese/README.md

@@ -25,13 +25,13 @@ adjust SDKをiOSプロジェクトに連携する手順を説明します。
 [こちらの手順](#sdk-integrate)に進んでください。
 
 ```ruby
-pod 'Adjust', '~> 4.18.0'
+pod 'Adjust', '~> 4.18.1'
 ```
 
 または
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.18.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.18.1'
 ```
 
 ---

doc/korean/README.md

@@ -73,13 +73,13 @@ iOS 개발용 Xcode를 사용한다는 가정하에 iOS 프로젝트에 Adjust S
 [CocoaPods][cocoapods]를 사용하는 경우, 다음 내용을 `Podfile`에 추가한 후 [해당 단계](#sdk-integrate)를 완료하세요.
 
 ```ruby
-pod 'Adjust', '~> 4.18.0'
+pod 'Adjust', '~> 4.18.1'
 ```
 
 또는:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.18.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.18.1'
 ```
 
 ---

doc/migrate.md

@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for iOS to v4.18.0 from v3.4.0
+## Migrate your adjust SDK for iOS to v4.18.1 from v3.4.0
 
 ### Initial setup