Merge branch 'QA' of ssh://github.com/BranchMetrics/ios-branch-deep-linking

Author: Edward Smith

Branch-SDK/Branch-SDK/BNCCallbacks.h

@@ -11,11 +11,11 @@
 
 @class BranchUniversalObject, BranchLinkProperties;
 
-typedef void (^callbackWithParams) (NSDictionary * _Nullable params, NSError * _Nullable error);
-typedef void (^callbackWithUrl) (NSString * _Nullable url, NSError * _Nullable error);
+typedef void (^callbackWithParams) (NSDictionary * _Nonnull params, NSError * _Nullable error);
+typedef void (^callbackWithUrl) (NSString * _Nonnull url, NSError * _Nullable error);
 typedef void (^callbackWithStatus) (BOOL changed, NSError * _Nullable error);
 typedef void (^callbackWithList) (NSArray * _Nullable list, NSError * _Nullable error);
 typedef void (^callbackWithUrlAndSpotlightIdentifier) (NSString * _Nullable url, NSString * _Nullable spotlightIdentifier, NSError * _Nullable error);
-typedef void (^callbackWithBranchUniversalObject) (BranchUniversalObject * _Nullable universalObject, BranchLinkProperties * _Nullable linkProperties, NSError * _Nullable error);
+typedef void (^callbackWithBranchUniversalObject) (BranchUniversalObject * _Nonnull universalObject, BranchLinkProperties * _Nonnull linkProperties, NSError * _Nullable error);
 
 #endif /* BNCCallbacks_h */

Branch-SDK/Branch-SDK/BNCConfig.h

@@ -9,7 +9,7 @@
 #ifndef Branch_SDK_Config_h
 #define Branch_SDK_Config_h
 
-#define SDK_VERSION             @"0.12.18"
+#define SDK_VERSION             @"0.12.19"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV

Branch-SDK/Branch-SDK/BNCPreferenceHelper.m

@@ -374,20 +374,17 @@ - (void)setUniversalLinkUrl:(NSString *)universalLinkUrl {
 }
 
 - (NSString *)sessionParams {
-    @synchronized (self) {
-        if (!_sessionParams) {
-            _sessionParams = [self readStringFromDefaults:BRANCH_PREFS_KEY_SESSION_PARAMS];
-        }
-        return _sessionParams;
+    if (_sessionParams) {
+        _sessionParams = [self readStringFromDefaults:BRANCH_PREFS_KEY_SESSION_PARAMS];
     }
+    
+    return _sessionParams;
 }
 
 - (void)setSessionParams:(NSString *)sessionParams {
-    @synchronized (self) {
-        if (![_sessionParams isEqualToString:sessionParams]) {
-            _sessionParams = sessionParams;
-            [self writeObjectToDefaults:BRANCH_PREFS_KEY_SESSION_PARAMS value:sessionParams];
-        }
+    if (![_sessionParams isEqualToString:sessionParams]) {
+        _sessionParams = sessionParams;
+        [self writeObjectToDefaults:BRANCH_PREFS_KEY_SESSION_PARAMS value:sessionParams];
     }
 }
 
@@ -609,48 +606,42 @@ - (NSDictionary *)getContentAnalyticsManifest {
     return (NSDictionary *)[self readObjectFromDefaults:BRANCH_PREFS_KEY_ANALYTICS_MANIFEST];
 }
 
-
 #pragma mark - Writing To Persistence
 
-
 - (void)writeIntegerToDefaults:(NSString *)key value:(NSInteger)value {
-    [self writeObjectToDefaults:key value:@(value)];
+    self.persistenceDict[key] = @(value);
+    [self persistPrefsToDisk];
 }
 
 - (void)writeBoolToDefaults:(NSString *)key value:(BOOL)value {
-    [self writeObjectToDefaults:key value:@(value)];
+    self.persistenceDict[key] = @(value);
+    [self persistPrefsToDisk];
 }
 
 - (void)writeObjectToDefaults:(NSString *)key value:(NSObject *)value {
-    @synchronized (self) {
-        if (value) {
-            self.persistenceDict[key] = value;
-        }
-        else {
-            [self.persistenceDict removeObjectForKey:key];
-        }
-        [self persistPrefsToDisk];
+    if (value) {
+        self.persistenceDict[key] = value;
+    }
+    else {
+        [self.persistenceDict removeObjectForKey:key];
     }
+
+    [self persistPrefsToDisk];
 }
 
 - (void)persistPrefsToDisk {
     @synchronized (self) {
-        if (!self.persistenceDict) return;
-        NSData *data = nil;
-        @try {
-            data = [NSKeyedArchiver archivedDataWithRootObject:self.persistenceDict];
-        }
-        @catch (id exception) {
-            data = nil;
-            [self logWarning:
-                [NSString stringWithFormat:@"Exception creating preferences data: %@.",
-                    exception]];
-        }
-        if (!data) {
-            [self logWarning:@"Can't create preferences data."];
-            return;
-        }
+        NSDictionary *persistenceDict = [self.persistenceDict copy];
         NSBlockOperation *newPersistOp = [NSBlockOperation blockOperationWithBlock:^ {
+            NSData *data = nil;
+            @try {
+                data = [NSKeyedArchiver archivedDataWithRootObject:persistenceDict];
+            } @catch (id n) {
+            }
+            if (!data) {
+                [self logWarning:@"Can't create preferences archive."];
+                return;
+            }
             NSError *error = nil;
             [data writeToURL:self.class.URLForPrefsFile
                 options:NSDataWritingAtomic error:&error];
@@ -660,7 +651,7 @@ - (void)persistPrefsToDisk {
                         @"Failed to persist preferences to disk: %@.", error]];
             }
         }];
-        [self.persistPrefsQueue addOperation:newPersistOp];
+    [self.persistPrefsQueue addOperation:newPersistOp];
     }
 }
 

Branch-SDK/Branch-SDK/BNCServerRequestQueue.h

@@ -26,7 +26,6 @@
 - (void)clearQueue;
 
 - (BOOL)containsInstallOrOpen;
-- (BOOL)removeInstallOrOpen;
 - (BOOL)containsClose;
 - (BranchOpenRequest *)moveInstallOrOpenToFront:(NSInteger)networkCount;
 

Branch-SDK/Branch-SDK/BNCServerRequestQueue.m

@@ -131,21 +131,6 @@ - (BOOL)containsInstallOrOpen {
     return NO;
 }
 
-- (BOOL)removeInstallOrOpen {
-    @synchronized (self.queue) {
-        for (int i = 0; i < self.queue.count; i++) {
-            BranchOpenRequest *req = [self.queue objectAtIndex:i];
-            // Install extends open, so only need to check open.
-            if ([req isKindOfClass:[BranchOpenRequest class]]) {
-                req.callback = nil;
-                [self remove:req];
-                return YES;
-            }
-        }
-        return NO;
-    }
-}
-
 - (BranchOpenRequest *)moveInstallOrOpenToFront:(NSInteger)networkCount {
     BOOL requestAlreadyInProgress = networkCount > 0;
 

Branch-SDK/Branch-SDK/BNCStrongMatchHelper.h

@@ -6,17 +6,14 @@
 //  Copyright © 2015 Branch Metrics. All rights reserved.
 //
 
-
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-
 @interface BNCStrongMatchHelper : NSObject
 
 + (BNCStrongMatchHelper *)strongMatchHelper;
 - (void)createStrongMatchWithBranchKey:(NSString *)branchKey;
 - (BOOL)shouldDelayInstallRequest;
-+ (NSURL *)getUrlForCookieBasedMatchingWithBranchKey:(NSString *)branchKey
-                                         redirectUrl:(NSString *)redirectUrl;
++ (NSURL *)getUrlForCookieBasedMatchingWithBranchKey:(NSString *)branchKey redirectUrl:(NSString *)redirectUrl;
 
 @end