Add nil check for country code and language code (flutter#4732)

NSLocale objectForKey: may return nil for NSLocaleLanguageCode and NSLocateCountryCode in certain cases. This adds a defensive nil check for such cases.
foropensource2014 · Mar 1, 2018 · 269bab7 · 269bab7
1 parent a4b1fcc
commit 269bab7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
@@ -724,7 +724,8 @@ - (void)onLocaleUpdated:(NSNotification*)notification {
   NSLocale* currentLocale = [NSLocale currentLocale];
   NSString* languageCode = [currentLocale objectForKey:NSLocaleLanguageCode];
   NSString* countryCode = [currentLocale objectForKey:NSLocaleCountryCode];
-  [_localizationChannel.get() invokeMethod:@"setLocale" arguments:@[ languageCode, countryCode ]];
+  if (languageCode && countryCode)
+    [_localizationChannel.get() invokeMethod:@"setLocale" arguments:@[ languageCode, countryCode ]];
 }
 
 #pragma mark - Set user settings