WIP

Author: morganchen12

FirebasePhoneAuthUI/Sources/FUICountryCodes.h

@@ -26,6 +26,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *dialCode;
 @property (nonatomic, copy) NSNumber *level;
 
+/** @property defaultCountryCodeInfo
+    @brief Get the default country code info
+    Returns the default country code. Formerly this was set via CTCarrier information, but CTCarrier is now
+    deprecated, so this value must be manually set.
+*/
+@property (nonatomic, copy) FUICountryCodeInfo *defaultCountryCodeInfo;
+
 - (NSString *)countryFlagEmoji;
 
 @end
@@ -55,16 +62,6 @@ NS_ASSUME_NONNULL_BEGIN
 */
 - (nullable FUICountryCodeInfo *)countryCodeInfoForCode:(NSString *)countryCode;
 
-/** @fn defaultCountryCodeInfo
-    @brief Get the default country code info
-    @detail The default country is retrieved based on the following logic:
-            1. The country code info of user's carrier provider if available.
-            2. The country code info of user's device locale, if available.
-            3. A hard coded coutry code info (US), if available.
-            4. The first available country code info in the instance.
-*/
-- (FUICountryCodeInfo *)defaultCountryCodeInfo;
-
 /** @fn blacklistCountries:
     @brief Remove the set of countries from available country codes.
     @param countries A set of blacklisted country codes. Country codes are in NSString format, and

FirebasePhoneAuthUI/Sources/FUICountryCodes.m

@@ -114,48 +114,9 @@ - (FUICountryCodeInfo *)countryCodeInfoAtIndex:(NSInteger)index {
 }
 
 - (FUICountryCodeInfo *)defaultCountryCodeInfo {
-  // Get the country code based on the information of user's telecommunication carrier provider.
-  CTCarrier *carrier;
-  if (@available(iOS 12, *)) {
-    NSDictionary *carriers =
-        [[[CTTelephonyNetworkInfo alloc] init] serviceSubscriberCellularProviders];
-    // For multi-sim phones, use the current locale to make an educated guess for
-    // which carrier to use.
-    NSString *currentCountryCode = [NSLocale currentLocale].countryCode;
-    for (CTCarrier *provider in carriers.allValues) {
-      if ([provider isKindOfClass:[CTCarrier class]] &&
-          [provider.isoCountryCode isEqualToString:currentCountryCode]) {
-        carrier = provider;
-        break;
-      }
-    }
-
-    // If the carrier is still nil, grab a random carrier from the dictionary.
-    if (carrier == nil) {
-      for (CTCarrier *provider in carriers.allValues) {
-        if ([provider isKindOfClass:[CTCarrier class]]) {
-          carrier = provider;
-          break;
-        }
-      }
-    }
-  } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    carrier = [[[CTTelephonyNetworkInfo alloc] init] subscriberCellularProvider];
-#pragma clang diagnostic pop
-  }
-  NSString *countryCode = carrier.isoCountryCode ?: [[self class] countryCodeFromDeviceLocale];
-  FUICountryCodeInfo *countryCodeInfo = [self countryCodeInfoForCode:countryCode];
-  // If carrier is not available, get the hard coded default country code.
-  if (!countryCodeInfo) {
-    countryCodeInfo = [self countryCodeInfoForCode:kFUIDefaultCountryCode];
+  if (_defaultCountryCodeInfo == nil) {
+    return [self countryCodeInfoForCode:kFUIDefaultCountryCode] ?: [self countryCodeInfoAtIndex:0];
   }
-  // If the hard coded default country code is not available, get the first available country code.
-  if (!countryCodeInfo) {
-    countryCodeInfo = [self countryCodeInfoAtIndex:0];
-  }
-  return countryCodeInfo;
 }
 
 - (FUICountryCodeInfo *)countryCodeInfoForPhoneNumber:(NSString *)phoneNumber {