Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix phone number format crash.

Browse Source
This commit is contained in:
Cody Henthorne
2021-12-20 12:34:40 -05:00
committed by Greyson Parrelli
parent a17fd447a7
commit 8c34357cc6
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java
View File

@@ -41,6 +41,11 @@ public class ContactsSyncAdapter extends AbstractThreadedSyncAdapter {
Context context = getContext();
if (SignalStore.account().getE164() == null) {
Log.i(TAG, "No local number set, skipping all sync operations.");
return;
}
if (!SignalStore.account().isRegistered()) {
Log.i(TAG, "Not push registered. Just syncing contact info.");
DirectoryHelper.syncRecipientInfoWithSystemContacts(context);

24
app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java
View File

@@ -142,20 +142,28 @@ public class PhoneNumberFormatter {
return phoneNumberUtil.format(parsedNumber, PhoneNumberUtil.PhoneNumberFormat.E164);
} catch (NumberParseException e) {
Log.w(TAG, e);
if (bareNumber.charAt(0) == '+')
if (bareNumber.charAt(0) == '+') {
return bareNumber;
}
String localNumberImprecise = localNumber.isPresent() ? localNumber.get().getE164Number() : "";
if (localNumber.isPresent()) {
String localNumberImprecise = localNumber.get().getE164Number();
if (localNumberImprecise.charAt(0) == '+')
localNumberImprecise = localNumberImprecise.substring(1);
if (localNumberImprecise.charAt(0) == '+') {
localNumberImprecise = localNumberImprecise.substring(1);
}
if (localNumberImprecise.length() == bareNumber.length() || bareNumber.length() > localNumberImprecise.length())
return "+" + number;
if (localNumberImprecise.length() == bareNumber.length() || bareNumber.length() > localNumberImprecise.length()) {
return "+" + number;
}
int difference = localNumberImprecise.length() - bareNumber.length();
int difference = localNumberImprecise.length() - bareNumber.length();
return "+" + localNumberImprecise.substring(0, difference) + bareNumber;
return "+" + localNumberImprecise.substring(0, difference) + bareNumber;
} else {
String countryCode = String.valueOf(phoneNumberUtil.getCountryCodeForRegion(localCountryCode));
return "+" + (bareNumber.startsWith(countryCode) ? bareNumber : countryCode + bareNumber);
}
}
}