diff --git a/Adjust.podspec b/Adjust.podspec index d22b7f486..dc54b39fb 100644 --- a/Adjust.podspec +++ b/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" => "welle@adjust.com" } - 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' diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m index 1a873c25e..3a0e656f0 100644 --- a/Adjust/ADJUtil.m +++ b/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 { diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h index 1828e546c..843d3b1d4 100644 --- a/Adjust/Adjust.h +++ b/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. // diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m index f4e361ebb..d3dbab329 100644 --- a/AdjustBridge/AdjustBridgeRegister.m +++ b/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) { diff --git a/AdjustTests/AdjustUnitTests/ADJPackageFields.m b/AdjustTests/AdjustUnitTests/ADJPackageFields.m index 5574dffde..e2947ec32 100644 --- a/AdjustTests/AdjustUnitTests/ADJPackageFields.m +++ b/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"; diff --git a/CHANGELOG.md b/CHANGELOG.md index c5863f7d1..0a8b51505 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/README.md b/README.md index c01d9358b..c8926ff66 100644 --- a/README.md +++ b/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' ``` --- diff --git a/VERSION b/VERSION index b30c4dcbf..cc84ce743 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.18.0 +4.18.1 diff --git a/doc/chinese/README.md b/doc/chinese/README.md index d098c4782..fb59cf306 100644 --- a/doc/chinese/README.md +++ b/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' ``` --- diff --git a/doc/english/migrate.md b/doc/english/migrate.md index 8532acdf3..65aa9cc83 100644 --- a/doc/english/migrate.md +++ b/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 diff --git a/doc/english/web_view_migration.md b/doc/english/web_view_migration.md index 6211581a5..ef05f31b5 100644 --- a/doc/english/web_view_migration.md +++ b/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 diff --git a/doc/english/web_views.md b/doc/english/web_views.md index 517e6bdeb..78f0fbfb3 100644 --- a/doc/english/web_views.md +++ b/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' ``` --- diff --git a/doc/japanese/README.md b/doc/japanese/README.md index ebaa2ef79..8614c000e 100644 --- a/doc/japanese/README.md +++ b/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' ``` --- diff --git a/doc/korean/README.md b/doc/korean/README.md index 338287b90..549c69a0a 100644 --- a/doc/korean/README.md +++ b/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' ``` --- diff --git a/doc/migrate.md b/doc/migrate.md index 8532acdf3..65aa9cc83 100644 --- a/doc/migrate.md +++ b/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