mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix phone number format crash.

fork-5.53.8
Cody Henthorne 2021-12-20 12:34:40 -05:00 zatwierdzone przez Greyson Parrelli
rodzic a17fd447a7
commit 8c34357cc6
3 zmienionych plików z 33 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java
Wyświetl plik

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

24
app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java
Wyświetl plik

@ -142,20 +142,28 @@ public class PhoneNumberFormatter {
return phoneNumberUtil.format(parsedNumber, PhoneNumberUtil.PhoneNumberFormat.E164); return phoneNumberUtil.format(parsedNumber, PhoneNumberUtil.PhoneNumberFormat.E164);
} catch (NumberParseException e) { } catch (NumberParseException e) {
Log.w(TAG, e); Log.w(TAG, e);
if (bareNumber.charAt(0) == '+') if (bareNumber.charAt(0) == '+') {
return bareNumber; return bareNumber;
}
String localNumberImprecise = localNumber.isPresent() ? localNumber.get().getE164Number() : ""; if (localNumber.isPresent()) {
String localNumberImprecise = localNumber.get().getE164Number();
if (localNumberImprecise.charAt(0) == '+') if (localNumberImprecise.charAt(0) == '+') {
localNumberImprecise = localNumberImprecise.substring(1); localNumberImprecise = localNumberImprecise.substring(1);
}
if (localNumberImprecise.length() == bareNumber.length() || bareNumber.length() > localNumberImprecise.length()) if (localNumberImprecise.length() == bareNumber.length() || bareNumber.length() > localNumberImprecise.length()) {
return "+" + number; 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);
}
} }
} }

13
app/src/test/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatterTest.java
Wyświetl plik

@ -3,13 +3,17 @@ package org.thoughtcrime.securesms.phonenumbers;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.testutil.EmptyLogger;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
public class PhoneNumberFormatterTest { public class PhoneNumberFormatterTest {
@Before @Before
public void setup() {} public void setup() {
Log.initialize(new EmptyLogger());
}
@Test @Test
public void testAddressString() throws Exception { public void testAddressString() throws Exception {
@ -89,4 +93,11 @@ public class PhoneNumberFormatterTest {
PhoneNumberFormatter formatter = new PhoneNumberFormatter("US", true); PhoneNumberFormatter formatter = new PhoneNumberFormatter("US", true);
assertEquals(formatter.format("(415) 111-1122"), "+14151111122"); assertEquals(formatter.format("(415) 111-1122"), "+14151111122");
} }
@Test
public void testParseNumberFailWithoutLocalNumber() {
PhoneNumberFormatter formatter = new PhoneNumberFormatter("US", true);
assertEquals("+144444444441234512312312312312312312312", formatter.format("44444444441234512312312312312312312312"));
assertEquals("+144444444441234512312312312312312312312", formatter.format("144444444441234512312312312312312312312"));
}
} }