Merge pull request #99 from adjust/socio_params

Socio params

Author: nonelse

Adjust.podspec

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

Adjust/ADJActivityHandler.m

@@ -163,7 +163,6 @@ - (void)setDeviceToken:(NSData *)deviceToken {
 
 - (void)setIadDate:(NSDate *)iAdImpressionDate withPurchaseDate:(NSDate *)appPurchaseDate {
     if (iAdImpressionDate == nil) {
-        [self.logger error:@"iAd click time is missing"];
         return;
     }
 

Adjust/ADJAttributionHandler.m

@@ -121,10 +121,14 @@ -(void) getAttributionInternal {
                                              returningResponse:&urlResponse
                                                          error:&requestError];
     // connection error
-    if (responseData == nil || requestError != nil) {
+    if (requestError != nil) {
         [self.logger error:@"Failed to get attribution. (%@)", requestError.localizedDescription];
         return;
     }
+    if (responseData == nil) {
+        [self.logger error:@"Failed to get attribution. (empty error)"];
+        return;
+    }
 
     NSString *responseString = [[[NSString alloc] initWithData:responseData encoding:NSUTF8StringEncoding] adjTrim];
     NSInteger statusCode = ((NSHTTPURLResponse*)urlResponse).statusCode;

Adjust/ADJEvent.h

@@ -17,6 +17,7 @@
 @property (nonatomic, copy, readonly) NSString* transactionId;
 @property (nonatomic, copy, readonly) NSString* currency;
 @property (nonatomic, copy, readonly) NSData* receipt;
+@property (nonatomic, assign, readonly) BOOL emptyReceipt;
 
 /**
  * Create Event object with Event Token.

Adjust/ADJEvent.m

@@ -154,6 +154,9 @@ - (BOOL) isValid {
 - (void) setReceipt:(NSData *)receipt transactionId:(NSString *)transactionId {
     if (![self checkReceipt:receipt transactionId:transactionId]) return;
 
+    if (receipt == nil || [receipt length] == 0) {
+        _emptyReceipt = YES;
+    }
     _receipt = receipt;
     _transactionId = transactionId;
 }

Adjust/ADJPackageBuilder.m

@@ -53,7 +53,12 @@ - (ADJActivityPackage *)buildEventPackage:(ADJEvent *) event{
     [self parameters:parameters setDictionaryJson:event.callbackParameters forKey:@"callback_params"];
     [self parameters:parameters setDictionaryJson:event.partnerParameters forKey:@"partner_params"];
 
-    if (event.receipt != nil) {
+    if (event.emptyReceipt) {
+        NSString *emptyReceipt = @"empty";
+        [self parameters:parameters setString:emptyReceipt forKey:@"receipt"];
+        [self parameters:parameters setString:event.transactionId forKey:@"transaction_id"];
+    }
+    else if (event.receipt != nil) {
         NSString *receiptBase64 = [event.receipt adjEncodeBase64];
         [self parameters:parameters setString:receiptBase64 forKey:@"receipt"];
         [self parameters:parameters setString:event.transactionId forKey:@"transaction_id"];

Adjust/ADJRequestHandler.m

@@ -72,8 +72,12 @@ - (void)sendInternal:(ADJActivityPackage *)package sendToPackageHandler:(BOOL)se
                                                      error:&error];
 
     // connection error
-    if (responseData == nil || error != nil) {
-        [self.logger error:@"%@. (%@) Will retry later.", package.failureMessage, error.localizedDescription];
+    if (error != nil || responseData == nil) {
+        if (error != nil) {
+            [self.logger error:@"%@. (%@) Will retry later.", package.failureMessage, error.localizedDescription];
+        } else {
+            [self.logger error:@"%@. (empty error) Will retry later.", package.failureMessage];
+        }
         [self.packageHandler finishedTrackingActivity:nil];
         if (sendToPackageHandler) {
             [self.packageHandler closeFirstPackage];

Adjust/ADJUtil.m

@@ -16,7 +16,7 @@
 #include <sys/xattr.h>
 
 static NSString * const kBaseUrl   = @"https://app.adjust.com";
-static NSString * const kClientSdk = @"ios4.2.2";
+static NSString * const kClientSdk = @"ios4.2.3";
 
 static NSString * const kDateFormat = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'Z";
 static NSDateFormatter *dateFormat;

AdjustTests/ADJActivityHandlerTests.m

@@ -121,7 +121,7 @@ - (void)testFirstRun
     ADJActivityPackage *activityPackage = (ADJActivityPackage *) self.packageHandlerMock.packageQueue[0];
 
     //  check the Sdk version is being tested
-    XCTAssertEqual(@"ios4.2.2", activityPackage.clientSdk, @"%@", activityPackage.extendedString);
+    XCTAssertEqual(@"ios4.2.3", activityPackage.clientSdk, @"%@", activityPackage.extendedString);
 
     // check the server url
     XCTAssertEqual(@"https://app.adjust.com", ADJUtil.baseUrl);
@@ -342,7 +342,7 @@ - (void)testEventsBuffered {
     [firstEvent setRevenue:0.0001 currency:@"EUR"];
 
     // set transaction id
-    [firstEvent setTransactionId:@"t_id_1"];
+    [firstEvent setReceipt:[[NSData alloc] init] transactionId:@"t_id_1"];
 
     // track the first event
     [activityHandler trackEvent:firstEvent];
@@ -461,7 +461,7 @@ - (void)testEventsBuffered {
     XCTAssert([(NSString *)firstEventPackageParameters[@"currency"] isEqualToString:@"EUR"], @"%@", firstEventPackage.extendedString);
 
     //   check the that the transaction id was not injected
-    XCTAssertNil(firstEventPackageParameters[@"transaction_id"], @"%@", firstEventPackage.extendedString);
+    XCTAssert([(NSString *)firstEventPackageParameters[@"transaction_id"] isEqualToString:@"t_id_1"], @"%@", firstEventPackage.extendedString);
 
     //   check the injected parameters
     XCTAssert([(NSString *)firstEventPackageParameters[@"callback_params"] isEqualToString:@"{\"keyCall\":\"valueCall2\",\"fooCall\":\"barCall\"}"],
@@ -470,6 +470,8 @@ - (void)testEventsBuffered {
     XCTAssert([(NSString *)firstEventPackageParameters[@"partner_params"] isEqualToString:@"{\"keyPartner\":\"valuePartner2\",\"fooPartner\":\"barPartner\"}"],
               @"%@", firstEventPackage.extendedString);
 
+    XCTAssert([(NSString *)firstEventPackageParameters[@"receipt"] isEqualToString:@"empty"], @"%@", firstEventPackage.extendedString);
+
     //  check the third event
     ADJActivityPackage *thirdEventPackage = (ADJActivityPackage *) self.packageHandlerMock.packageQueue[2];
     NSDictionary *thirdEventPackageParameters = thirdEventPackage.parameters;
@@ -899,10 +901,6 @@ - (void)testClickPackage {
     // check that the deep link send a click package
     XCTAssert([self.loggerMock containsMessage:ADJLogLevelTest beginsWith:@"ADJPackageHandler sendClickPackage"], @"%@", self.loggerMock);
 
-    // check the iAd is missing twice
-    XCTAssert([self.loggerMock containsMessage:ADJLogLevelError beginsWith:@"iAd click time is missing"], @"%@", self.loggerMock);
-    XCTAssert([self.loggerMock containsMessage:ADJLogLevelError beginsWith:@"iAd click time is missing"], @"%@", self.loggerMock);
-
     // 1 session + 1 deep link
     XCTAssertEqual((NSUInteger)2, [self.packageHandlerMock.packageQueue count], @"%@", self.loggerMock);
 

README.md

@@ -17,7 +17,7 @@ If you're using [CocoaPods][cocoapods], you can add the following line to your
 `Podfile` and continue with [step 3](#step3):
 
 ```ruby
-pod 'Adjust', :git => 'git://github.com/adjust/ios_sdk.git', :tag => 'v4.2.2'
+pod 'Adjust', :git => 'git://github.com/adjust/ios_sdk.git', :tag => 'v4.2.3'
 ```
 
 ### 1. Get the SDK