Merge pull request #233 from adjust/v485

SFSafariViewController compatibility
adjust · Aug 30, 2016 · 06f5874 · 06f5874
2 parents d40ed83 + 7a303c2
commit 06f5874
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git 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" => "[email protected]" }
-  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/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 {

diff --git 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
@@ -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/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.

diff --git 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
@@ -1 +1 @@
-4.8.4
+4.8.5