Decoupled country code discovery from language discovery. (#650)

Author: E-B-Smith

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -58,35 +58,80 @@ - (id)init {
     self.screenHeight = [BNCSystemObserver getScreenHeight];
     self.isAdTrackingEnabled = [BNCSystemObserver adTrackingSafe];
 
+    self.country = [self.class bnc_country];
+    self.language = [self.class bnc_language];
+    self.browserUserAgent = [self.class userAgentString];
+    return self;
+}
+
++ (NSString*) bnc_country {
+
+    NSString *country = nil;
+    #define returnIfValidCountry() \
+        if ([country isKindOfClass:[NSString class]] && country.length) { \
+            return country; \
+        } else { \
+            country = nil; \
+        }
+
+    // Should work on iOS 10
     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 ([currentLocale respondsToSelector:@selector(countryCode)]) {
+        country = [currentLocale countryCode];
     }
-
-    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"];
+    returnIfValidCountry();
+
+    // Should work on iOS 9
+    NSString *rawLanguage = [[NSLocale preferredLanguages] firstObject];
+    NSDictionary *languageDictionary = [NSLocale componentsFromLocaleIdentifier:rawLanguage];
+    country = [languageDictionary objectForKey:@"kCFLocaleCountryCodeKey"];
+    returnIfValidCountry();
+
+    // Should work on iOS 8 and below.
+    //NSString* language = [[NSLocale preferredLanguages] firstObject];
+    NSString *rawLocale = currentLocale.localeIdentifier;
+    NSRange range = [rawLocale rangeOfString:@"_"];
+    if (range.location != NSNotFound) {
+        range = NSMakeRange(range.location+1, rawLocale.length-range.location-1);
+        country = [rawLocale substringWithRange:range];
     }
+    returnIfValidCountry();
 
-    if (!self.country) {
-        // Should work on iOS 8 and below.
-        self.language = [[NSLocale preferredLanguages] firstObject];
-        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];
-        }
+    #undef returnIfValidCountry
+
+    return nil;
+}
+
++ (NSString*) bnc_language {
+
+    NSString *language = nil;
+    #define returnIfValidLanguage() \
+        if ([language isKindOfClass:[NSString class]] && language.length) { \
+            return language; \
+        } else { \
+            language = nil; \
+        } \
+
+    // Should work on iOS 10
+    NSLocale *currentLocale = [NSLocale currentLocale];
+    if ([currentLocale respondsToSelector:@selector(languageCode)]) {
+        language = [currentLocale languageCode];
     }
+    returnIfValidLanguage();
 
-    self.browserUserAgent = [self.class userAgentString];
-    return self;
+    // Should work on iOS 9
+    NSString *rawLanguage = [[NSLocale preferredLanguages] firstObject];
+    NSDictionary *languageDictionary = [NSLocale componentsFromLocaleIdentifier:rawLanguage];
+    language = [languageDictionary  objectForKey:@"kCFLocaleLanguageCodeKey"];
+    returnIfValidLanguage();
+
+    // Should work on iOS 8 and below.
+    language = [[NSLocale preferredLanguages] firstObject];
+    returnIfValidLanguage();
+
+    #undef returnIfValidLanguage
+
+    return nil;
 }
 
 + (NSString*) systemBuildVersion {