Merge pull request #157 from adjust/device_ids

Device ids
adjust · Feb 1, 2016 · 47f7cb1 · 47f7cb1
2 parents aef1d3c + 30f31fe
commit 47f7cb1
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 7 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.5.1"
+  s.version        = "4.5.2"
   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.5.1" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.5.2" }
   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
@@ -16,7 +16,7 @@
 #include <sys/xattr.h>
 
 static NSString * const kBaseUrl   = @"https://app.adjust.com";
-static NSString * const kClientSdk = @"ios4.5.1";
+static NSString * const kClientSdk = @"ios4.5.2";
 
 static NSString * const kDateFormat = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'Z";
 static NSDateFormatter *dateFormat;

diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h
@@ -95,6 +95,8 @@ extern NSString * const ADJEnvironmentProduction;
  */
 + (void)setOfflineMode:(BOOL)enabled;
 
++ (NSString*)idfa;
+
 /**
  * Obtain singleton Adjust object
  */

diff --git a/Adjust/Adjust.m b/Adjust/Adjust.m
@@ -10,6 +10,7 @@
 #import "ADJActivityHandler.h"
 #import "ADJAdjustFactory.h"
 #import "ADJLogger.h"
+#import "UIDevice+ADJAdditions.h"
 
 #if !__has_feature(objc_arc)
 #error Adjust requires ARC
@@ -64,6 +65,10 @@ + (void)setOfflineMode:(BOOL)enabled {
     [[Adjust getInstance] setOfflineMode:enabled];
 }
 
++ (NSString*)idfa {
+    return [[UIDevice currentDevice] adjIdForAdvertisers];
+}
+
 + (id)getInstance {
     static Adjust *defaultInstance = nil;
     static dispatch_once_t onceToken;
@@ -133,6 +138,10 @@ - (void)setOfflineMode:(BOOL)enabled {
     [self.activityHandler setOfflineMode:enabled];
 }
 
+- (NSString*)idfa {
+    return [[UIDevice currentDevice] adjIdForAdvertisers];
+}
+
 #pragma mark - private
 
 - (BOOL) checkActivityHandler {

diff --git a/AdjustTests/ADJPackageFields.m b/AdjustTests/ADJPackageFields.m
@@ -16,7 +16,7 @@ - (id) init {
 
     // default values
     self.appToken = @"123456789012";
-    self.clientSdk = @"ios4.5.1";
+    self.clientSdk = @"ios4.5.2";
     self.suffix = @"";
     self.environment = @"sandbox";
 

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ If you're using [CocoaPods][cocoapods] for `iOs` or `tvOS`, you can add the foll
 `Podfile` and continue with [step 4](#step4):
 
 ```ruby
-pod 'Adjust', :git => 'git://github.com/adjust/ios_sdk.git', :tag => 'v4.5.1'
+pod 'Adjust', :git => 'git://github.com/adjust/ios_sdk.git', :tag => 'v4.5.2'
 ```
 
 If you're using [Carthage][carthage], you can add following line to your `Cartfile`

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.5.1
+4.5.2
diff --git a/doc/migrate.md b/doc/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for iOS to v4.5.1 from v3.4.0
+## Migrate your adjust SDK for iOS to v4.5.2 from v3.4.0
 
 ### Initial setup
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,6 +95,8 @@ extern NSString * const ADJEnvironmentProduction; @@
      */
     + (void)setOfflineMode:(BOOL)enabled;
+    + (NSString*)idfa;
     /**
      * Obtain singleton Adjust object
      */
@@ Expand Down @@