diff --git a/src/Contacts/PhoneNumber.m b/src/Contacts/PhoneNumber.m index dd42f8700..622a7c4f3 100644 --- a/src/Contacts/PhoneNumber.m +++ b/src/Contacts/PhoneNumber.m @@ -22,14 +22,14 @@ static NSString *const RPDefaultsKeyPhoneNumberCanonical = @"RPDefaultsKeyPhoneN NBPhoneNumber *number = [phoneUtil parse:text defaultRegion:regionCode error:&parseError]; if (parseError) { - DDLogWarn(@"Issue while parsing number: %@", [parseError description]); + DDLogDebug(@"Issue while parsing number: %@", [parseError description]); return nil; } NSError *toE164Error; NSString *e164 = [phoneUtil format:number numberFormat:NBEPhoneNumberFormatE164 error:&toE164Error]; if (toE164Error) { - DDLogWarn(@"Issue while parsing number: %@", [toE164Error description]); + DDLogDebug(@"Issue while formatting number: %@", [toE164Error description]); return nil; } diff --git a/src/Contacts/PhoneNumberUtil.m b/src/Contacts/PhoneNumberUtil.m index fd1ae035a..504cd43d8 100644 --- a/src/Contacts/PhoneNumberUtil.m +++ b/src/Contacts/PhoneNumberUtil.m @@ -52,6 +52,13 @@ if (!result) { result = [self.nbPhoneNumberUtil parse:numberToParse defaultRegion:defaultRegion error:error]; + if (error && *error) { + OWSAssert(!result); + return nil; + } + + OWSAssert(result); + if (result) { [self.parsedPhoneNumberCache setObject:result forKey:hashKey]; } else {