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

Only show change number event when previous e164 known and different.

fork-5.53.8
Cody Henthorne 2021-09-10 12:12:07 -04:00 zatwierdzone przez GitHub
rodzic 2eaadd4337
commit dfecb0efd8
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 13 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
Wyświetl plik

@ -498,10 +498,16 @@ public class RecipientDatabase extends Database {
finalId = byUuid.get(); finalId = byUuid.get();
} else { } else {
Log.i(TAG, String.format(Locale.US, "Found out about an E164 (%s) for a known UUID user (%s). High-trust, so updating.", e164, byUuid.get()), true); Log.i(TAG, String.format(Locale.US, "Found out about an E164 (%s) for a known UUID user (%s). High-trust, so updating.", e164, byUuid.get()), true);
RecipientSettings byUuidSettings = getRecipientSettings(byUuid.get());
setPhoneNumberOrThrow(byUuid.get(), e164); setPhoneNumberOrThrow(byUuid.get(), e164);
finalId = byUuid.get(); finalId = byUuid.get();
if (!Util.isEmpty(byUuidSettings.e164) && !byUuidSettings.e164.equals(e164)) {
recipientChangedNumber = finalId; recipientChangedNumber = finalId;
} }
}
} else { } else {
Log.i(TAG, String.format(Locale.US, "Found out about an E164 (%s) for a known UUID user (%s). Low-trust, so doing nothing.", e164, byUuid.get()), true); Log.i(TAG, String.format(Locale.US, "Found out about an E164 (%s) for a known UUID user (%s). Low-trust, so doing nothing.", e164, byUuid.get()), true);
finalId = byUuid.get(); finalId = byUuid.get();
@ -524,9 +530,14 @@ public class RecipientDatabase extends Database {
removePhoneNumber(byE164.get(), db); removePhoneNumber(byE164.get(), db);
recipientNeedingRefresh = byE164.get(); recipientNeedingRefresh = byE164.get();
setPhoneNumberOrThrow(byUuid.get(), Objects.requireNonNull(e164)); RecipientSettings byUuidSettings = getRecipientSettings(byUuid.get());
setPhoneNumberOrThrow(byUuid.get(), Objects.requireNonNull(e164));
finalId = byUuid.get(); finalId = byUuid.get();
if (!Util.isEmpty(byUuidSettings.e164) && !byUuidSettings.e164.equals(e164)) {
recipientChangedNumber = finalId;
}
} else { } else {
Log.w(TAG, "The E164 contact has a different UUID. Likely a case of re-registration. Low-trust, so doing nothing.", true); Log.w(TAG, "The E164 contact has a different UUID. Likely a case of re-registration. Low-trust, so doing nothing.", true);
finalId = byUuid.get(); finalId = byUuid.get();