Merge branch 'charlesmchen/searchLocalCallingCode'

Podfile.lock

@@ -134,7 +134,7 @@ CHECKOUT OPTIONS:
     :commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :commit: cd4cb1709c70e6224180b30b7b1ede59bf978615
+    :commit: 2f7e76f82c98a43e8f6f57e6bd8c2783cdb73edf
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf

Signal/src/ViewControllers/SelectRecipientViewController.m

@@ -214,10 +214,28 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien
 
 - (void)populateDefaultCountryNameAndCode
 {
-    NSLocale *locale = NSLocale.currentLocale;
-    NSString *countryCode = [locale objectForKey:NSLocaleCountryCode];
-    NSNumber *callingCode = [[PhoneNumberUtil sharedUtil].nbPhoneNumberUtil getCountryCodeForRegion:countryCode];
+    PhoneNumber *localNumber = [PhoneNumber phoneNumberFromE164:[TSAccountManager localNumber]];
+    OWSAssert(localNumber);
+
+    NSString *countryCode;
+    NSNumber *callingCode;
+    if (localNumber) {
+        callingCode = [localNumber getCountryCode];
+        OWSAssert(callingCode);
+        if (callingCode) {
+            countryCode = [[PhoneNumberUtil sharedUtil]
+                probableCountryCodeForCallingCode:[@"+" stringByAppendingString:[callingCode description]]];
+        }
+    }
+
+    if (!countryCode || !callingCode) {
+        NSLocale *locale = NSLocale.currentLocale;
+        countryCode = [locale objectForKey:NSLocaleCountryCode];
+        callingCode = [[PhoneNumberUtil sharedUtil].nbPhoneNumberUtil getCountryCodeForRegion:countryCode];
+    }
+
     NSString *countryName = [PhoneNumberUtil countryNameFromCountryCode:countryCode];
+
     [self updateCountryWithName:countryName
                     callingCode:[NSString stringWithFormat:@"%@%@", COUNTRY_CODE_PREFIX, callingCode]
                     countryCode:countryCode];