From 5feca4282162b7dc1c35889c8d4c31fc7466e27f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 6 Apr 2017 21:35:11 -0400 Subject: [PATCH] Reformat phone number if user changes country code. // FREEBIE --- Signal/src/ViewControllers/AddToBlockListViewController.m | 2 ++ Signal/src/ViewControllers/RegistrationViewController.m | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Signal/src/ViewControllers/AddToBlockListViewController.m b/Signal/src/ViewControllers/AddToBlockListViewController.m index 8aa290299..54b56e766 100644 --- a/Signal/src/ViewControllers/AddToBlockListViewController.m +++ b/Signal/src/ViewControllers/AddToBlockListViewController.m @@ -436,6 +436,8 @@ NSString *const kContactsTable_CellReuseIdentifier = @"kContactsTable_CellReuseI [self updateCountryWithName:countryName callingCode:callingCode countryCode:countryCode]; + + [self textField:_phoneNumberTextField shouldChangeCharactersInRange:NSMakeRange(0, 0) replacementString:@""]; } #pragma mark - UITextFieldDelegate diff --git a/Signal/src/ViewControllers/RegistrationViewController.m b/Signal/src/ViewControllers/RegistrationViewController.m index c15275854..6ffec001f 100644 --- a/Signal/src/ViewControllers/RegistrationViewController.m +++ b/Signal/src/ViewControllers/RegistrationViewController.m @@ -223,13 +223,7 @@ static NSString *const kCodeSentSegue = @"codeSent"; countryCode:vc.countryCodeSelected]; // Reformat phone number - NSString *digits = _phoneNumberTextField.text.digitsOnly; - NSString *reformattedNumber = - [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:digits - withSpecifiedCountryCodeString:_countryCodeButton.titleLabel.text]; - _phoneNumberTextField.text = reformattedNumber; - UITextPosition *pos = _phoneNumberTextField.endOfDocument; - [_phoneNumberTextField setSelectedTextRange:[_phoneNumberTextField textRangeFromPosition:pos toPosition:pos]]; + [self textField:_phoneNumberTextField shouldChangeCharactersInRange:NSMakeRange(0, 0) replacementString:@""]; } #pragma mark iPhone 5s or shorter