Merge pull request #52 from adjust/development

Add push token

Author: nonelse

Adjust.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "3.3.4"
+  s.version        = "3.3.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 => "v3.3.4" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v3.3.5" }
   s.platform       = :ios, '4.3'
   s.framework      = 'SystemConfiguration'
   s.weak_framework = 'AdSupport', 'iAd'

Adjust.xcodeproj/project.pbxproj

@@ -336,9 +336,9 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0510;
-				ORGANIZATIONNAME = adjust;
+				ORGANIZATIONNAME = "adjust GmbH";
 			};
-			buildConfigurationList = 9679920818BBAE2800394606 /* Build configuration list for PBXProject "Adjust" */;
+			buildConfigurationList = 9679920818BBAE2800394606 /* Build configuration list for PBXProject "adjust" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -577,7 +577,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		9679920818BBAE2800394606 /* Build configuration list for PBXProject "Adjust" */ = {
+		9679920818BBAE2800394606 /* Build configuration list for PBXProject "adjust" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				9679922E18BBAE2800394606 /* Debug */,

Adjust/AIActivityHandler.h

@@ -33,6 +33,7 @@
 - (void)setEnabled:(BOOL)enabled;
 - (BOOL)isEnabled;
 - (void)readOpenUrl:(NSURL*)url;
+- (void)savePushToken:(NSData *)pushToken;
 
 @end
 

Adjust/AIActivityHandler.m

@@ -49,6 +49,7 @@ @interface AIActivityHandler()
 @property (nonatomic, assign) BOOL internalEnabled;
 @property (nonatomic, assign) BOOL isIad;
 @property (nonatomic, copy) NSString *vendorId;
+@property (nonatomic, copy) NSString *pushToken;
 
 @end
 
@@ -153,6 +154,12 @@ - (void)readOpenUrl:(NSURL*)url {
     });
 }
 
+- (void)savePushToken:(NSData *)pushToken {
+    dispatch_async(self.internalQueue, ^{
+        [self savePushTokenInternal:pushToken];
+    });
+}
+
 #pragma mark - internal
 - (void)initInternal:(NSString *)yourAppToken {
     if (![self checkAppTokenNotNil:yourAppToken]) return;
@@ -364,6 +371,17 @@ - (void) readOpenUrlInternal:(NSURL *)url {
     [self.logger debug:@"Reattribution %@", adjustDeepLinks];
 }
 
+- (void) savePushTokenInternal:(NSData *)pushToken {
+    if (pushToken == nil) {
+        return;
+    }
+
+    NSString *token = [pushToken.description stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"<>"]];
+    token = [token stringByReplacingOccurrencesOfString:@" " withString:@""];
+
+    self.pushToken = token;
+}
+
 #pragma mark - private
 
 // returns whether or not the activity state should be written
@@ -446,6 +464,7 @@ - (void)injectGeneralAttributes:(AIPackageBuilder *)builder {
     builder.environment      = self.environment;
     builder.isIad            = self.isIad;
     builder.vendorId         = self.vendorId;
+    builder.pushToken        = self.pushToken;
 
     if (self.trackMacMd5) {
         builder.macShortMd5 = self.macShortMd5;

Adjust/AIPackageBuilder.h

@@ -24,6 +24,7 @@
 @property (nonatomic, assign) BOOL trackingEnabled;
 @property (nonatomic, assign) BOOL isIad;
 @property (nonatomic, copy) NSString *vendorId;
+@property (nonatomic, copy) NSString *pushToken;
 
 // sessions
 @property (nonatomic, assign) int sessionCount;

Adjust/AIPackageBuilder.m

@@ -90,6 +90,7 @@ - (NSMutableDictionary *)defaultParameters {
     [self parameters:parameters setInt:self.trackingEnabled     forKey:@"tracking_enabled"];
     [self parameters:parameters setBool:self.isIad              forKey:@"is_iad"];
     [self parameters:parameters setString:self.vendorId         forKey:@"idfv"];
+    [self parameters:parameters setString:self.pushToken        forKey:@"push_token"];
 
     // session related (used for events as well)
     [self parameters:parameters setInt:self.sessionCount         forKey:@"session_count"];

Adjust/AIUtil.m

@@ -14,7 +14,7 @@
 #include <sys/xattr.h>
 
 static NSString * const kBaseUrl   = @"https://app.adjust.io";
-static NSString * const kClientSdk = @"ios3.3.4";
+static NSString * const kClientSdk = @"ios3.3.5";
 
 static NSString * const kDateFormat = @"yyyy-MM-dd'T'HH:mm:ss'Z'Z";
 static NSDateFormatter * dateFormat;

Adjust/Adjust.h

@@ -169,6 +169,11 @@ static NSString * const AIEnvironmentProduction = @"production";
  * an adjust deep link
  */
 + (void)appWillOpenUrl:(NSURL *)url;
+
+/**
+ * Set the device token used by push notifications
+ */
++ (void)setDeviceToken:(NSData *)deviceToken;
 @end
 
 

Adjust/Adjust.m

@@ -136,4 +136,8 @@ + (void)appWillOpenUrl:(NSURL *)url {
     [activityHandler readOpenUrl:url];
 }
 
++ (void)setDeviceToken:(NSData *)deviceToken {
+    [activityHandler savePushToken:deviceToken];
+}
+
 @end

AdjustTests/AIActivityHandlerMock.m

@@ -76,4 +76,8 @@ - (void)readOpenUrl:(NSURL *)url {
     [self.loggerMock test:[prefix stringByAppendingFormat:@"readOpenUrl"]];
 }
 
+- (void)savePushToken:(NSData *)pushToken {
+    [self.loggerMock test:[prefix stringByAppendingFormat:@"savePushToken"]];
+}
+
 @end