Updated QA from test results.

Author: Edward Smith

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -27,7 +27,7 @@ @implementation BNCDeviceInfo {
 
 + (BNCDeviceInfo *)getInstance {
     static BNCDeviceInfo *bnc_deviceInfo = 0;
-    static dispatch_once_t onceToken;
+    static dispatch_once_t onceToken = 0;
     dispatch_once(&onceToken, ^{
         bnc_deviceInfo = [[BNCDeviceInfo alloc] init];
     });

Branch-SDK/Branch-SDK/BNCError.h

@@ -32,3 +32,5 @@ typedef NS_ENUM(NSInteger, BNCErrorCode) {
 + (NSError*_Nonnull) branchErrorWithCode:(BNCErrorCode)errorCode error:(NSError*_Nullable)error;
 + (NSError*_Nonnull) branchErrorWithCode:(BNCErrorCode)errorCode localizedMessage:(NSString*_Nullable)message;
 @end
+
+void BNCForceNSErrorCategoryToLoad(void) __attribute__((constructor));

Branch-SDK/Branch-SDK/BNCError.m

@@ -11,8 +11,7 @@
 
 NSString * const BNCErrorDomain = @"io.branch.sdk.error";
 
-void BNCForceNSErrorCategoryToLoad(void) __attribute__((constructor));
-void BNCForceNSErrorCategoryToLoad() {
+__attribute__((constructor)) void BNCForceNSErrorCategoryToLoad() {
     // Nothing here, but forces linker to load the category.
 }
 

Branch-SDK/Branch-SDK/Branch.m

@@ -40,6 +40,7 @@
 #import "NSMutableDictionary+Branch.h"
 #import "BNCNetworkService.h"
 #import "BNCLog.h"
+#import "NSString+Branch.h"
 #import "BNCFabricAnswers.h"
 #import "../Fabric/FABKitProtocol.h" // Fabric
 
@@ -77,7 +78,9 @@
 
 void ForceCategoriesToLoad(void);
 void ForceCategoriesToLoad(void) {
-    ForceNSMutableDictionaryToLoad();
+    BNCForceNSErrorCategoryToLoad();
+    BNCForceNSStringCategoryToLoad();
+    BNCForceNSMutableDictionaryCategoryToLoad();
 }
 
 
@@ -125,15 +128,23 @@ + (void) load {
     [self openLog];
 }
 
+static NSURL* bnc_logURL = nil;
+
 + (void) openLog {
     // Initialize the log
-    BNCLogInitialize();
-    BNCLogSetDisplayLevel(BNCLogLevelAll);    
-    NSURL *logURL = BNCURLForBranchDirectory();
-    logURL = [logURL URLByAppendingPathComponent:@"Branch.log"];
-    BNCLogSetOutputToURLByteWrap(logURL, 102400);
-    BNCLogSetDisplayLevel(BNCLogLevelWarning);
-    BNCLogDebug(@"Branch version %@ started at %@.", BNC_SDK_VERSION, [NSDate date]);
+    @synchronized (self) {
+        if (!bnc_logURL) {
+            BNCLogInitialize();
+            BNCLogSetDisplayLevel(BNCLogLevelAll);    
+            bnc_logURL = BNCURLForBranchDirectory();
+            bnc_logURL = [bnc_logURL URLByAppendingPathComponent:@"Branch.log"];
+            BNCLogSetOutputToURLByteWrap(bnc_logURL, 102400);
+            BNCLogSetDisplayLevel(BNCLogLevelWarning);
+            BNCLogDebug(@"Branch version %@ started at %@.", BNC_SDK_VERSION, [NSDate date]);
+        } else {
+            BNCLogSetOutputToURLByteWrap(bnc_logURL, 102400);
+        }
+    }
 }
 
 + (void) closeLog {
@@ -365,7 +376,8 @@ + (BOOL) enableFingerprintIDInCrashlyticsReports
 
 - (void)setDebug {
     self.preferenceHelper.isDebug = YES;
-    BNCLogSetDisplayLevel(BNCLogLevelDebug);
+    if (BNCLogDisplayLevel() > BNCLogLevelDebug)
+        BNCLogSetDisplayLevel(BNCLogLevelDebug);
 }
 
 - (void)resetUserSession {
@@ -1652,6 +1664,8 @@ - (void) processRequest:(BNCServerRequest*)req
     }
     // On network problems, or Branch down, call the other callbacks and stop processing.
     else {
+        BNCLogDebugSDK(@"Network error: failing queued requests.");
+
         // First, gather all the requests to fail
         NSMutableArray *requestsToFail = [[NSMutableArray alloc] init];
         for (int i = 0; i < self.requestQueue.queueDepth; i++) {
@@ -1727,7 +1741,9 @@ - (void)processNextQueueItem {
 #pragma mark - Session Initialization
 
 - (void)initSessionIfNeededAndNotInProgress {
-    if (!self.isInitialized && !self.preferenceHelper.shouldWaitForInit && ![self.requestQueue containsInstallOrOpen]) {
+    if (!self.isInitialized &&
+        !self.preferenceHelper.shouldWaitForInit &&
+        ![self.requestQueue containsInstallOrOpen]) {
         [self initUserSessionAndCallCallback:NO];
     }
 }

Branch-SDK/Branch-SDK/BranchShareLink.m

@@ -159,18 +159,22 @@ - (void) presentActivityViewControllerFromViewController:(UIViewController*_Null
     shareViewController.title = self.title;
 
     if ([shareViewController respondsToSelector:@selector(completionWithItemsHandler)]) {
+
         shareViewController.completionWithItemsHandler =
-        ^ (NSString *activityType, BOOL completed, NSArray *returnedItems, NSError *activityError) {
-            [self shareDidComplete:completed activityError:activityError];
-        };
+            ^ (NSString *activityType, BOOL completed, NSArray *returnedItems, NSError *activityError) {
+                [self shareDidComplete:completed activityError:activityError];
+            };
+
     } else {
+
         #pragma clang diagnostic push
         #pragma clang diagnostic ignored "-Wdeprecated-declarations"
         shareViewController.completionHandler =
-        ^ (UIActivityType activityType, BOOL completed) {
-            [self shareDidComplete:completed activityError:nil];
-        };
+            ^ (UIActivityType activityType, BOOL completed) {
+                [self shareDidComplete:completed activityError:nil];
+            };
         #pragma clang diagnostic pop
+        
     }
 
     if (self.linkProperties.controlParams[BRANCH_LINK_DATA_KEY_EMAIL_SUBJECT]) {

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

@@ -10,7 +10,7 @@
 #import <Foundation/Foundation.h>
 
 
-void ForceNSMutableDictionaryToLoad(void) __attribute__((constructor));
+void BNCForceNSMutableDictionaryCategoryToLoad(void) __attribute__((constructor));
 
 
 @interface NSMutableDictionary (Branch)

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

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

Branch-SDK/Branch-SDK/NSString+Branch.h

@@ -28,3 +28,5 @@
 - (NSString*_Nonnull) bnc_stringTruncatedAtNull;
 
 @end
+
+void BNCForceNSStringCategoryToLoad(void) __attribute__((constructor));

Branch-SDK/Branch-SDK/NSString+Branch.m

@@ -16,8 +16,7 @@
 #import "NSString+Branch.h"
 
 
-void BNCForceNSStringCategoryToLoad(void) __attribute__((constructor));
-void BNCForceNSStringCategoryToLoad() {
+__attribute__((constructor)) void BNCForceNSStringCategoryToLoad() {
     //  Nothing here, but forces linker to load the category.
 }
 

Branch-TestBed-Xcode-7/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
@@ -54,6 +64,16 @@
       "filename" : "icon180x180.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",