Fixed category linking. Fixed carthage build. Updated change log.

Author: Edward Smith

Branch-SDK/Branch-SDK/Branch.m

@@ -34,6 +34,7 @@
 #import "BranchSpotlightUrlRequest.h"
 #import "BranchRegisterViewRequest.h"
 #import "BranchContentDiscoverer.h"
+#import "NSMutableDictionary+Branch.h"
 
 //Fabric
 #import "../Fabric/FABKitProtocol.h"
@@ -68,6 +69,18 @@
 NSString * const BNCShareInitiatedEvent = @"Share Started";
 NSString * const BNCShareCompletedEvent = @"Share Completed";
 
+
+#pragma mark - Load Categories
+
+void ForceCategoriesToLoad();
+void ForceCategoriesToLoad() {
+    ForceNSMutableDictionaryToLoad();
+}
+
+
+#pragma mark - Branch
+
+
 @interface Branch() <BranchDeepLinkingControllerCompletionDelegate, FABKit>
 
 
@@ -147,6 +160,9 @@ + (Branch *)getInstance:(NSString *)branchKey {
 
 - (id)initWithInterface:(BNCServerInterface *)interface queue:(BNCServerRequestQueue *)queue cache:(BNCLinkCache *)cache preferenceHelper:(BNCPreferenceHelper *)preferenceHelper key:(NSString *)key {
     if (self = [super init]) {
+
+        ForceCategoriesToLoad();
+
         _bServerInterface = interface;
         _bServerInterface.preferenceHelper = preferenceHelper;
         _requestQueue = queue;

Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.h

@@ -10,6 +10,9 @@
 #import <Foundation/Foundation.h>
 
 
+void ForceNSMutableDictionaryToLoad();
+
+
 @interface NSMutableDictionary (Branch)
 
 - (void) bnc_safeSetObject:(id)anObject forKey:(id<NSCopying>)aKey;

Branch-SDK/Branch-SDK/NSMutableDictionary+Branch.m

@@ -25,3 +25,8 @@ - (void) bnc_safeAddEntriesFromDictionary:(NSDictionary<id<NSCopying>,id> *)othe
 }
 
 @end
+
+
+void ForceNSMutableDictionaryToLoad() {
+    //  Does nothing.  But will force the linker to include this category.
+}

Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj

@@ -621,23 +621,23 @@
 				E2B9474A1D15D75000F2270D /* BNCCallbacks.h in Headers */,
 				54FF1F951BD20EB50004CE2E /* BranchRegisterViewRequest.h in Headers */,
 				46946B851B26898800627BCC /* BNCServerRequest.h in Headers */,
-				466D5A111B5991E3009DB845 /* BNCContentDiscoveryManager.h in Headers */,
 				466B58741B17780A00A69EDE /* BNCPreferenceHelper.h in Headers */,
 				4D8EE7A51E1F0A5D00B1F450 /* BNCCommerceEvent.h in Headers */,
 				4D35141B1E3201D80085EBA1 /* NSMutableDictionary+Branch.h in Headers */,
 				466B58791B17780A00A69EDE /* BNCConfig.h in Headers */,
 				7D4DAC211C8FA8C0008E37DB /* BranchView.h in Headers */,
 				7D4DAC271C8FA908008E37DB /* BranchViewHandler.h in Headers */,
 				54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */,
+				466D5A111B5991E3009DB845 /* BNCContentDiscoveryManager.h in Headers */,
 				54FF1F8D1BD1D4AE0004CE2E /* BranchUniversalObject.h in Headers */,
 				46946B9F1B2689A100627BCC /* BranchShortUrlSyncRequest.h in Headers */,
 				46946B9E1B2689A100627BCC /* BranchShortUrlRequest.h in Headers */,
 				466B58781B17780A00A69EDE /* BNCServerRequestQueue.h in Headers */,
 				466B58751B17780A00A69EDE /* BNCServerInterface.h in Headers */,
 				46946B981B2689A100627BCC /* BranchLoadRewardsRequest.h in Headers */,
 				466B587B1B17780A00A69EDE /* BNCServerResponse.h in Headers */,
-				466B587F1B17780A00A69EDE /* BNCEncodingUtils.h in Headers */,
 				460F4FA71B618A38002E84D6 /* BranchSpotlightUrlRequest.h in Headers */,
+				466B587F1B17780A00A69EDE /* BNCEncodingUtils.h in Headers */,
 				54FF1F911BD1DC320004CE2E /* BranchLinkProperties.h in Headers */,
 				4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */,
 				67486B8D1B93B48A0044D872 /* BNCStrongMatchHelper.h in Headers */,

ChangeLog.md

@@ -2,13 +2,20 @@ Branch iOS SDK Change Log
 
 - v0.12.25
   * > Beta Release <
-  * Added a beta release deployment script.
+  * Added a deployment script for beta releases.
+  * Fixed crashes related to nil values being inserted into a dictionary (GH #551 & #552).
+  * Made callback block properties atomic/copy to prevent a possible crashes due to race conditions.
+  * In the BNCServerInterface code, the code blocks for NSURLSessionCompletionHandler and
+    NSURLConnectionCompletionHandler are now copied blocks rather global static blocks.
+    This prevents a crash when the block is deallocated or reallocated (GH #548).
+  * Added a Swift example for the new Branch commerce event, `BNCCommerceEvent`, in the
+    TestBed-Swift project.
 
 - v0.12.24
   * Updated Fabric files.
   * Made the release script more robust.
   * Made changes to the Safari Strong Match Helper to ensure that:
-    - Safari doesn't steal the firstResponder status. 
+    - Safari doesn't steal the firstResponder status.
     - The hidden Safari view is inserted correctly into the ViewController / View hierarchy.
 
 - v0.12.23

carthage-files/BranchSDK.xcodeproj/project.pbxproj

@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		4D19C1C21DC110FB008D8B38 /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D19C1C01DC110FA008D8B38 /* BNCXcode7Support.h */; };
 		4D19C1C31DC110FB008D8B38 /* BNCXcode7Support.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D19C1C11DC110FB008D8B38 /* BNCXcode7Support.m */; };
+		4D291AAB1E322ECC007ED118 /* NSMutableDictionary+Branch.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D291AA91E322ECC007ED118 /* NSMutableDictionary+Branch.h */; };
+		4D291AAC1E322ECC007ED118 /* NSMutableDictionary+Branch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D291AAA1E322ECC007ED118 /* NSMutableDictionary+Branch.m */; };
 		4D3922BD1E1F0C85004FB7C8 /* BNCCommerceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D3922BC1E1F0C85004FB7C8 /* BNCCommerceEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4D3FA94D1DFF3F6C00E2B6A9 /* BNCConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D3FA94C1DFF3F6C00E2B6A9 /* BNCConfig.m */; };
 		4DA40A8F1E1F0011004D2534 /* BNCCommerceEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DA40A8D1E1F0011004D2534 /* BNCCommerceEvent.m */; };
@@ -97,6 +99,8 @@
 /* Begin PBXFileReference section */
 		4D19C1C01DC110FA008D8B38 /* BNCXcode7Support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCXcode7Support.h; sourceTree = "<group>"; };
 		4D19C1C11DC110FB008D8B38 /* BNCXcode7Support.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCXcode7Support.m; sourceTree = "<group>"; };
+		4D291AA91E322ECC007ED118 /* NSMutableDictionary+Branch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+Branch.h"; sourceTree = "<group>"; };
+		4D291AAA1E322ECC007ED118 /* NSMutableDictionary+Branch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+Branch.m"; sourceTree = "<group>"; };
 		4D3922BC1E1F0C85004FB7C8 /* BNCCommerceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCCommerceEvent.h; sourceTree = "<group>"; };
 		4D3FA94C1DFF3F6C00E2B6A9 /* BNCConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCConfig.m; sourceTree = "<group>"; };
 		4DA40A8D1E1F0011004D2534 /* BNCCommerceEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCCommerceEvent.m; sourceTree = "<group>"; };
@@ -263,6 +267,8 @@
 				E230A13E1D03DB9E006181D8 /* BranchView.m */,
 				E230A13F1D03DB9E006181D8 /* BranchViewHandler.h */,
 				E230A1401D03DB9E006181D8 /* BranchViewHandler.m */,
+				4D291AA91E322ECC007ED118 /* NSMutableDictionary+Branch.h */,
+				4D291AAA1E322ECC007ED118 /* NSMutableDictionary+Branch.m */,
 				E230A1411D03DB9E006181D8 /* Requests */,
 			);
 			name = "Branch-SDK";
@@ -377,6 +383,7 @@
 				4D19C1C21DC110FB008D8B38 /* BNCXcode7Support.h in Headers */,
 				E230A1AC1D03DB9E006181D8 /* BranchRedeemRewardsRequest.h in Headers */,
 				E230A1AE1D03DB9E006181D8 /* BranchRegisterViewRequest.h in Headers */,
+				4D291AAB1E322ECC007ED118 /* NSMutableDictionary+Branch.h in Headers */,
 				E230A18F1D03DB9E006181D8 /* BranchLinkProperties.h in Headers */,
 				E230A1BC1D03DB9F006181D8 /* PromoViewHandler.h in Headers */,
 				E230A1881D03DB9E006181D8 /* BranchActivityItemProvider.h in Headers */,
@@ -486,6 +493,7 @@
 				E230A1761D03DB9E006181D8 /* BNCLinkCache.m in Sources */,
 				E230A1AD1D03DB9E006181D8 /* BranchRedeemRewardsRequest.m in Sources */,
 				7DA3BF1D1D889CE500CA8AE0 /* BranchContentDiscoverer.m in Sources */,
+				4D291AAC1E322ECC007ED118 /* NSMutableDictionary+Branch.m in Sources */,
 				E230A1971D03DB9E006181D8 /* BranchViewHandler.m in Sources */,
 				E230A1801D03DB9E006181D8 /* BNCServerResponse.m in Sources */,
 				E230A1A91D03DB9E006181D8 /* BranchLogoutRequest.m in Sources */,
@@ -610,6 +618,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "$(SRCROOT)/module.modulemap";
+				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.branch.ios-carthage";
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME)";
 				PRODUCT_NAME = Branch;
@@ -629,6 +638,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "$(SRCROOT)/module.modulemap";
+				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.branch.ios-carthage";
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME)";
 				PRODUCT_NAME = Branch;