[release] 0.35.1

Author: branch-sdkteam

Branch-SDK/BNCConfig.m

@@ -11,4 +11,4 @@
 NSString * const BNC_API_BASE_URL    = @"https://api2.branch.io";
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"0.35.0";
+NSString * const BNC_SDK_VERSION     = @"0.35.1";

Branch-SDK/BNCServerInterface.m

@@ -249,7 +249,7 @@ - (void)genericHTTPRequest:(NSURLRequest *)request
         if (![self whiteListContainsEndpoint:endpoint]) {
             [[BNCPreferenceHelper preferenceHelper] clearTrackingInformation];
             NSError *error = [NSError branchErrorWithCode:BNCTrackingDisabledError];
-            BNCLogError(@"Network service error: %@.", error);
+            BNCLogWarning(@"Dropping Request %@: - %@", endpoint, error);
             if (callback) {
                 callback(nil, error);
             }

Branch-SDK/Branch.m

@@ -2041,21 +2041,24 @@ - (void)processNextQueueItem {
 
         if (req) {
 
-            if (![req isKindOfClass:[BranchInstallRequest class]] && !self.preferenceHelper.identityID) {
-                BNCLogError(@"User session has not been initialized!");
-                BNCPerformBlockOnMainThreadSync(^{
-                    [req processResponse:nil error:[NSError branchErrorWithCode:BNCInitError]];
-                });
-                return;
-
-            } else if (![req isKindOfClass:[BranchOpenRequest class]] &&
-                (!self.preferenceHelper.deviceFingerprintID || !self.preferenceHelper.sessionID)) {
-                BNCLogError(@"Missing session items!");
-                BNCPerformBlockOnMainThreadSync(^{
-                    [req processResponse:nil error:[NSError branchErrorWithCode:BNCInitError]];
-                });
-                return;
+            // If tracking is disabled, then do not check for install event.  It won't exist.
+            if (!Branch.trackingDisabled) {
+                if (![req isKindOfClass:[BranchInstallRequest class]] && !self.preferenceHelper.identityID) {
+                    BNCLogError(@"User session has not been initialized!");
+                    BNCPerformBlockOnMainThreadSync(^{
+                        [req processResponse:nil error:[NSError branchErrorWithCode:BNCInitError]];
+                    });
+                    return;
+
+                } else if (![req isKindOfClass:[BranchOpenRequest class]] &&
+                    (!self.preferenceHelper.deviceFingerprintID || !self.preferenceHelper.sessionID)) {
+                    BNCLogError(@"Missing session items!");
+                    BNCPerformBlockOnMainThreadSync(^{
+                        [req processResponse:nil error:[NSError branchErrorWithCode:BNCInitError]];
+                    });
+                    return;
 
+                }
             }
 
             dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);

Branch-SDK/BranchEvent.m

@@ -74,7 +74,7 @@ - (void)processResponse:(BNCServerResponse*)response error:(NSError*)error {
 	NSDictionary *dictionary = ([response.data isKindOfClass:[NSDictionary class]])
 		? (NSDictionary*) response.data : nil;
 
-    if (dictionary) {
+    if (dictionary && [dictionary[BRANCH_RESPONSE_KEY_UPDATE_CONVERSION_VALUE] isKindOfClass:NSNumber.class]) {
         NSNumber *conversionValue = (NSNumber *)dictionary[BRANCH_RESPONSE_KEY_UPDATE_CONVERSION_VALUE];
         if (conversionValue) {
             [[BNCSKAdNetwork sharedInstance] updateConversionValue:conversionValue.integerValue];

Branch-SDK/BranchOpenRequest.m

@@ -152,8 +152,11 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     preferenceHelper.sessionID = data[BRANCH_RESPONSE_KEY_SESSION_ID];
     preferenceHelper.previousAppBuildDate = [BNCApplication currentApplication].currentBuildDate;
 
-    if (data[BRANCH_RESPONSE_KEY_INVOKE_REGISTER_APP]) {
-        [[BNCSKAdNetwork sharedInstance] registerAppForAdNetworkAttribution];
+    if ([data[BRANCH_RESPONSE_KEY_INVOKE_REGISTER_APP] isKindOfClass:NSNumber.class]) {
+        NSNumber *invokeRegister = (NSNumber *)data[BRANCH_RESPONSE_KEY_INVOKE_REGISTER_APP];
+        if (invokeRegister.boolValue) {
+            [[BNCSKAdNetwork sharedInstance] registerAppForAdNetworkAttribution];
+        }
     }
 
     if (Branch.enableFingerprintIDInCrashlyticsReports) {

Branch-TestBed/Branch-SDK-Tests/BNCAppleAdClientTests.m

@@ -31,9 +31,9 @@ - (void)tearDown {
     // Put teardown code here. This method is called after the invocation of each test method in the class.
 }
 
-// verifies AdClient loaded via reflection is the sharedClient
 - (void)testAdClientLoadsViaReflection {
-    XCTAssertTrue([ADClient sharedClient] == [BNCAppleAdClient new].adClient);
+    XCTAssertNotNil([BNCAppleAdClient new].adClient);
+    XCTAssertTrue([[BNCAppleAdClient new].adClient isKindOfClass:ADClient.class]);
 }
 
 /*

Branch-TestBed/Framework-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.33.1</string>
+	<string>0.35.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.33.1</string>
+	<string>0.35.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

Branch.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "0.35.0"
+  s.version          = "0.35.1"
   s.summary          = "Create an HTTP URL for any piece of content in your app"
   s.description      = <<-DESC
 - Want the highest possible conversions on your sharing feature?

ChangeLog.md

@@ -1,5 +1,11 @@
 Branch iOS SDK Change Log
 
+v0.35.1
+October 6, 2020
+
+INTENG-11208
+Bug fix.  It is possible to block all network calls if the user never opts in.  This leads to link resolution reliability issues.
+
 v0.35.0
 August 24, 2020
 

scripts/version

@@ -31,7 +31,7 @@ Options:
 USAGE
 }
 
-version=0.35.0
+version=0.35.1
 
 if (( $# == 0 )); then
     echo $version