Made a fix for device country code crash. Enabled on on-device unit testing for iOS 7. (#647)

Author: E-B-Smith

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -23,13 +23,13 @@ @interface BNCDeviceInfo()
 
 @implementation BNCDeviceInfo
 
-static BNCDeviceInfo *bncDeviceInfo;
-
 + (BNCDeviceInfo *)getInstance {
-    if (!bncDeviceInfo) {
-        bncDeviceInfo = [[BNCDeviceInfo alloc] init];
-    }
-    return bncDeviceInfo;
+    static BNCDeviceInfo *bnc_deviceInfo = 0;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        bnc_deviceInfo = [[BNCDeviceInfo alloc] init];
+    });
+    return bnc_deviceInfo;
 }
 
 - (id)init {
@@ -58,31 +58,31 @@ - (id)init {
     self.screenHeight = [BNCSystemObserver getScreenHeight];
     self.isAdTrackingEnabled = [BNCSystemObserver adTrackingSafe];
 
-    //  Get the locale info --
-    CGFloat systemVersion = [UIDevice currentDevice].systemVersion.floatValue;
-    if (systemVersion < 9.0) {
+    NSLocale *currentLocale = [NSLocale currentLocale];
+    if ([currentLocale respondsToSelector:@selector(countryCode)] &&
+        [currentLocale respondsToSelector:@selector(languageCode)]) {
+        // Should work on iOS 10
+        self.country = [currentLocale countryCode];
+        self.language = [currentLocale languageCode];
+    }
+
+    if (!self.country) {
+        // Should work on iOS 9
+        NSString *rawLanguage = [[NSLocale preferredLanguages] firstObject];
+        NSDictionary *languageDictionary = [NSLocale componentsFromLocaleIdentifier:rawLanguage];
+        self.country = [languageDictionary objectForKey:@"kCFLocaleCountryCodeKey"];
+        self.language = [languageDictionary  objectForKey:@"kCFLocaleLanguageCodeKey"];
+    }
 
+    if (!self.country) {
+        // Should work on iOS 8 and below.
         self.language = [[NSLocale preferredLanguages] firstObject];
-        NSString *rawLocale = [NSLocale currentLocale].localeIdentifier;
+        NSString *rawLocale = currentLocale.localeIdentifier;
         NSRange range = [rawLocale rangeOfString:@"_"];
         if (range.location != NSNotFound) {
             range = NSMakeRange(range.location+1, rawLocale.length-range.location-1);
             self.country = [rawLocale substringWithRange:range];
         }
-
-    } else if (systemVersion < 10.0) {
-
-        NSString *rawLanguage = [[NSLocale preferredLanguages] firstObject];
-        NSDictionary *languageDictionary = [NSLocale componentsFromLocaleIdentifier:rawLanguage];
-        self.country = [languageDictionary objectForKey:@"kCFLocaleCountryCodeKey"];
-        self.language = [languageDictionary  objectForKey:@"kCFLocaleLanguageCodeKey"];
-
-    } else {
-
-        NSLocale *locale = [NSLocale currentLocale];
-        self.country = [locale countryCode];
-        self.language = [locale languageCode ];
-
     }
 
     self.browserUserAgent = [self.class userAgentString];

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

@@ -163,6 +163,13 @@
 			remoteGlobalIDString = 466B58371B17773000A69EDE;
 			remoteInfo = Branch;
 		};
+		4DED9ECE1F032EDD0033A6C3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 670016581940F51400A9E103 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 6700165F1940F51400A9E103;
+			remoteInfo = "Branch-TestBed";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -745,6 +752,7 @@
 			);
 			dependencies = (
 				4683F07C1B20AC6300A432E7 /* PBXTargetDependency */,
+				4DED9ECF1F032EDD0033A6C3 /* PBXTargetDependency */,
 			);
 			name = "Branch-SDK-Tests";
 			productName = "Branch-SDK Functionality Tests";
@@ -777,6 +785,7 @@
 					7E6B3B501AA42D0E005F45BF = {
 						CreatedOnToolsVersion = 6.1.1;
 						DevelopmentTeam = R63EM248DP;
+						TestTargetID = 6700165F1940F51400A9E103;
 					};
 				};
 			};
@@ -851,7 +860,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		CA6C45DB44005B39B2D6B322 /* [CP] Embed Pods Frameworks */ = {
@@ -982,6 +991,11 @@
 			target = 466B58371B17773000A69EDE /* Branch */;
 			targetProxy = 4683F07B1B20AC6300A432E7 /* PBXContainerItemProxy */;
 		};
+		4DED9ECF1F032EDD0033A6C3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 6700165F1940F51400A9E103 /* Branch-TestBed */;
+			targetProxy = 4DED9ECE1F032EDD0033A6C3 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -1144,7 +1158,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				USER_HEADER_SEARCH_PATHS = $PROJECT_DIR;
+				USER_HEADER_SEARCH_PATHS = "$PROJECT_DIR";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -1165,7 +1179,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				USER_HEADER_SEARCH_PATHS = $PROJECT_DIR;
+				USER_HEADER_SEARCH_PATHS = "$PROJECT_DIR";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
@@ -1185,6 +1199,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Branch-TestBed.app/Branch-TestBed";
 			};
 			name = Debug;
 		};
@@ -1199,6 +1214,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Branch-TestBed.app/Branch-TestBed";
 			};
 			name = Release;
 		};