Merge pull request #1388 from BranchMetrics/SDK-2302

SDK 2302 update singleton creation to dispatch once

Author: echo-branch

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

@@ -291,8 +291,8 @@ - (void)testDecodeQueryStringToDictionary {
 #pragma mark - Test Util methods
 
 - (NSString *)stringForDate:(NSDate *)date {
-    static NSDateFormatter *dateFormatter;
-    static dispatch_once_t onceToken;
+    static NSDateFormatter *dateFormatter = nil;
+    static dispatch_once_t onceToken = 0;
 
     dispatch_once(&onceToken, ^{
         dateFormatter = [[NSDateFormatter alloc] init];

Sources/BranchSDK/BNCAppGroupsData.m

@@ -18,8 +18,8 @@ @interface BNCAppGroupsData()
 @implementation BNCAppGroupsData
 
 + (instancetype)shared {
-    static BNCAppGroupsData *appGroupsData;
-    static dispatch_once_t onceToken;
+    static BNCAppGroupsData *appGroupsData = nil;
+    static dispatch_once_t onceToken = 0;
     dispatch_once(&onceToken, ^{
         appGroupsData = [BNCAppGroupsData new];
     });

Sources/BranchSDK/BNCAppleReceipt.m

@@ -23,8 +23,8 @@ @interface BNCAppleReceipt()
 @implementation BNCAppleReceipt
 
 + (BNCAppleReceipt *)sharedInstance {
-    static BNCAppleReceipt *singleton;
-    static dispatch_once_t onceToken;
+    static BNCAppleReceipt *singleton = nil;
+    static dispatch_once_t onceToken = 0;
     dispatch_once(&onceToken, ^{
         singleton = [BNCAppleReceipt new];
     });

Sources/BranchSDK/BNCCallbackMap.m

@@ -15,8 +15,8 @@ @interface BNCCallbackMap()
 @implementation BNCCallbackMap
 
 + (instancetype)shared {
-    static BNCCallbackMap *map;
-    static dispatch_once_t onceToken;
+    static BNCCallbackMap *map = nil;
+    static dispatch_once_t onceToken = 0;
     dispatch_once(&onceToken, ^{
         map = [BNCCallbackMap new];
     });

Sources/BranchSDK/BNCDeviceInfo.m

@@ -34,7 +34,7 @@ @interface BNCDeviceInfo()
 @implementation BNCDeviceInfo
 
 + (BNCDeviceInfo *)getInstance {
-    static BNCDeviceInfo *bnc_deviceInfo = 0;
+    static BNCDeviceInfo *bnc_deviceInfo = nil;
     static dispatch_once_t onceToken = 0;
     dispatch_once(&onceToken, ^{
         bnc_deviceInfo = [BNCDeviceInfo new];

Sources/BranchSDK/BNCEncodingUtils.m

@@ -129,9 +129,8 @@ + (NSString *)sha256Encode:(NSString *)input {
 #pragma mark - Param Encoding methods
 
 + (NSString *)iso8601StringFromDate:(NSDate *)date {
-    static NSDateFormatter *dateFormatter;
-    static dispatch_once_t onceToken;
-    
+    static NSDateFormatter *dateFormatter = nil;
+    static dispatch_once_t onceToken = 0;
     dispatch_once(&onceToken, ^{
         dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setLocale:[NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]]; // POSIX to avoid weird issues

Sources/BranchSDK/BNCEventUtils.m

@@ -15,8 +15,8 @@ @interface BNCEventUtils()
 @implementation BNCEventUtils
 
 + (instancetype)shared {
-    static BNCEventUtils *set;
-    static dispatch_once_t onceToken;
+    static BNCEventUtils *set = nil;
+    static dispatch_once_t onceToken = 0;
     dispatch_once(&onceToken, ^{
         set = [BNCEventUtils new];
     });

Sources/BranchSDK/BNCKeyChain.m

@@ -149,9 +149,9 @@ + (NSError*) removeValuesForService:(NSString *)service key:(NSString *)key {
 
 // The security access group string is prefixed with the Apple Developer Team ID
 + (NSString * _Nullable)securityAccessGroup {
-    @synchronized(self) {
-        static NSString *_securityAccessGroup = nil;
-        if (_securityAccessGroup) return _securityAccessGroup;
+    static NSString *_securityAccessGroup = nil;
+    static dispatch_once_t onceToken = 0;
+    dispatch_once(&onceToken, ^{
 
         // The keychain cannot be empty prior to requesting the security access group string. Add a tmp variable.
         NSError *error = [self storeDate:[NSDate date] forService:@"BranchKeychainService" key:@"Temp" cloudAccessGroup:nil];
@@ -168,18 +168,23 @@ + (NSString * _Nullable)securityAccessGroup {
         };
         CFDictionaryRef resultDictionary = NULL;
         OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)dictionary, (CFTypeRef*)&resultDictionary);
-        if (status == errSecItemNotFound) return nil;
+        
+        if (status == errSecItemNotFound) { 
+            return;
+        }
         if (status != errSecSuccess) {
             [[BranchLogger shared] logWarning:[NSString stringWithFormat:@"Failed to retrieve security access group"] error:[self errorWithKey:nil OSStatus:status]];
-            return nil;
+            return;
         }
         NSString *group = [(__bridge NSDictionary *)resultDictionary objectForKey:(__bridge NSString *)kSecAttrAccessGroup];
         if (group.length > 0) {
             _securityAccessGroup = [group copy];
         }
         CFRelease(resultDictionary);
-        return _securityAccessGroup;
-    }
+    });
+    
+    return _securityAccessGroup;
+
 }
 
 @end

Sources/BranchSDK/BNCPartnerParameters.m

@@ -16,8 +16,8 @@ @interface BNCPartnerParameters()
 @implementation BNCPartnerParameters
 
 + (instancetype)shared {
-    static BNCPartnerParameters *partnerParameters;
-    static dispatch_once_t onceToken;
+    static BNCPartnerParameters *partnerParameters = nil;
+    static dispatch_once_t onceToken = 0;
     dispatch_once(&onceToken, ^{
         partnerParameters = [BNCPartnerParameters new];
     });

Sources/BranchSDK/BNCPasteboard.m

@@ -13,8 +13,8 @@
 @implementation BNCPasteboard
 
 + (BNCPasteboard *)sharedInstance {
-    static BNCPasteboard *pasteboard;
-    static dispatch_once_t onceToken;
+    static BNCPasteboard *pasteboard = nil;
+    static dispatch_once_t onceToken = 0;
     dispatch_once(&onceToken, ^{
         pasteboard = [BNCPasteboard new];
     });