Version 0.20.2. Fixed race condition and test.

Author: Edward Smith

Branch-SDK/Branch-SDK/BNCConfig.m

@@ -12,5 +12,5 @@
 BOOL       const BNC_API_PINNED      = YES;
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"0.20.1";
+NSString * const BNC_SDK_VERSION     = @"0.20.2";
 

Branch-SDK/Branch-SDK/Branch.m

@@ -80,19 +80,18 @@ void ForceCategoriesToLoad(void) {
     BNCForceNSMutableDictionaryCategoryToLoad();
 }
 
-
 #pragma mark - Branch
 
-
-@interface Branch() <BranchDeepLinkingControllerCompletionDelegate, FABKit>
-
+@interface Branch() <BranchDeepLinkingControllerCompletionDelegate, FABKit> {
+    NSInteger _networkCount;
+}
 
 @property (strong, nonatomic) BNCServerInterface *bServerInterface;
 @property (strong, nonatomic) BNCServerRequestQueue *requestQueue;
 @property (strong, nonatomic) dispatch_semaphore_t processing_sema;
 @property (copy,   nonatomic) callbackWithParams sessionInitWithParamsCallback;
 @property (copy,   nonatomic) callbackWithBranchUniversalObject sessionInitWithBranchUniversalObjectCallback;
-@property (assign, nonatomic) NSInteger networkCount;
+@property (assign, atomic)    NSInteger networkCount;
 @property (assign, nonatomic) NSInteger asyncRequestCount;
 @property (assign, nonatomic) BOOL isInitialized;
 @property (assign, nonatomic) BOOL shouldCallSessionInitCallback;
@@ -1658,6 +1657,18 @@ - (void)callClose {
 
 #pragma mark - Queue management
 
+- (NSInteger) networkCount {
+    @synchronized (self) {
+        return _networkCount;
+    }
+}
+
+- (void) setNetworkCount:(NSInteger)networkCount {
+    @synchronized (self) {
+        _networkCount = networkCount;
+    }
+}
+
 - (void)insertRequestAtFront:(BNCServerRequest *)req {
     if (self.networkCount == 0) {
         [self.requestQueue insert:req at:0];

Branch-SDK/Branch-SDK/Networking/BNCServerRequestQueue.m

@@ -42,8 +42,10 @@ - (id)init {
 }
 
 - (void) dealloc {
-    if (self.persistTimer)
+    if (self.persistTimer) {
         dispatch_source_cancel(self.persistTimer);
+        self.persistTimer = nil;
+    }
     [self persistImmediately];
 }
 

Branch-TestBed/Branch-SDK-Tests/BranchNetworkScenario.Test.m

@@ -440,6 +440,7 @@ - (void)testScenario7 {
 // Somehow, betweeen initSession and the next call, all preference items are cleared.
 // Shouldn't crash in this case, but can't do much besides "you need to re-init"
 - (void)testScenario8 {
+    sleep(1);
     BNCPreferenceHelper *preferenceHelper = [[BNCPreferenceHelper alloc] init];
     id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
 

Branch-TestBed/Framework-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.20.1</string>
+	<string>0.20.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.20.1</string>
+	<string>0.20.2</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.20.1"
+  s.version          = "0.20.2"
   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?

carthage-files/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.20.1</string>
+	<string>0.20.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.20.1</string>
+	<string>0.20.2</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

scripts/version

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