From c50a1ce53e14d7fb6d3ada5da88eabd474f7e34e Mon Sep 17 00:00:00 2001 From: uerceg Date: Tue, 30 Aug 2016 09:52:38 +0200 Subject: [PATCH 1/3] Supressing SFSafariViewController usage for iOS 8 and lower --- Adjust/ADJTrackingPixel.m | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Adjust/ADJTrackingPixel.m b/Adjust/ADJTrackingPixel.m index 709b568f6..8cecea6d2 100644 --- a/Adjust/ADJTrackingPixel.m +++ b/Adjust/ADJTrackingPixel.m @@ -58,7 +58,13 @@ - (id)init { } + (void)present { - [[ADJTrackingPixel getInstance] present]; + // If SFSafariViewController is present, use it. + // SFSafariViewController is supported starting from iOS 9. + if (NSClassFromString(@"SFSafariViewController")) { + [[ADJTrackingPixel getInstance] present]; + } else { + [[ADJAdjustFactory logger] warn:@"AdWords request can't be sent with this iOS version"]; + } } - (void)present { From 50625b1cea51b8c31ac53df45e8ac05f33b63586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uglje=C5=A1a=20Erceg?= Date: Tue, 30 Aug 2016 09:54:08 +0200 Subject: [PATCH 2/3] Changes from v4.8.5 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a800916d..bea8de737 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### Version 4.8.5 (30th August 2016) +#### Fixed +- Not using `SFSafariViewController` on iOS devices with iOS version lower than 9. + +--- + ### Version 4.8.4 (18th August 2016) #### Added - Added support for making Google AdWords request in iOS 10. From 7a303c2e7f9d8c50acd0fc68cc978fa51a4da06f Mon Sep 17 00:00:00 2001 From: uerceg Date: Tue, 30 Aug 2016 09:56:20 +0200 Subject: [PATCH 3/3] New version 4.8.5 --- Adjust.podspec | 4 ++-- Adjust/ADJUtil.m | 2 +- AdjustTests/ADJPackageFields.m | 2 +- README.md | 6 +++--- VERSION | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Adjust.podspec b/Adjust.podspec index 5f7e7b126..083e4b893 100644 --- a/Adjust.podspec +++ b/Adjust.podspec @@ -1,11 +1,11 @@ Pod::Spec.new do |s| s.name = "Adjust" - s.version = "4.8.4" + s.version = "4.8.5" s.summary = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com." s.homepage = "http://adjust.com" 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.8.4" } + s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.8.5" } 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 7eb992915..d890792d5 100644 --- a/Adjust/ADJUtil.m +++ b/Adjust/ADJUtil.m @@ -23,7 +23,7 @@ static NSRegularExpression * shortUniversalLinkRegex = nil; static NSNumberFormatter * secondsNumberFormatter = nil; -static NSString * const kClientSdk = @"ios4.8.4"; +static NSString * const kClientSdk = @"ios4.8.5"; static NSString * const kDefaultScheme = @"AdjustUniversalScheme"; static NSString * const kUniversalLinkPattern = @"https://[^.]*\\.ulink\\.adjust\\.com/ulink/?(.*)"; static NSString * const kShortUniversalLinkPattern = @"http[s]?://[a-z0-9]{4}\\.adj\\.st/?(.*)"; diff --git a/AdjustTests/ADJPackageFields.m b/AdjustTests/ADJPackageFields.m index 80f7985d0..a1ae6e2af 100644 --- a/AdjustTests/ADJPackageFields.m +++ b/AdjustTests/ADJPackageFields.m @@ -16,7 +16,7 @@ - (id) init { // default values self.appToken = @"qwerty123456"; - self.clientSdk = @"ios4.8.4"; + self.clientSdk = @"ios4.8.5"; self.suffix = @""; self.environment = @"sandbox"; diff --git a/README.md b/README.md index d1627c4cf..c44d54bb0 100644 --- a/README.md +++ b/README.md @@ -64,13 +64,13 @@ If you're using [CocoaPods][cocoapods], you can add the following line to your ` [this step](#sdk-integrate): ```ruby -pod 'Adjust', '~> 4.8.4' +pod 'Adjust', '~> 4.8.5' ``` or: ```ruby -pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.8.4' +pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.8.5' ``` If you're using [Carthage][carthage], you can add following line to your `Cartfile` and continue with @@ -837,7 +837,7 @@ send `sdk_click` package anyway to the adjust backend. If you have your log leve ``` [Adjust]d: Added package 1 (click) [Adjust]v: Path: /sdk_click -[Adjust]v: ClientSdk: ios4.8.4 +[Adjust]v: ClientSdk: ios4.8.5 [Adjust]v: Parameters: [Adjust]v: app_token {YourAppToken} [Adjust]v: created_at 2016-04-15T14:25:51.676Z+0200 diff --git a/VERSION b/VERSION index 57c4b30bb..bb6ebd31d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.8.4 +4.8.5