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

While testing GV2 without UUID, fail jobs that hit UuidRecipientError.

fork-5.53.8
Alan Evans 2020-05-26 15:33:17 -03:00 zatwierdzone przez Greyson Parrelli
rodzic c5e7300df2
commit 28bd245b96
1 zmienionych plików z 10 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
Wyświetl plik

@ -192,9 +192,13 @@ public class Recipient {
} }
return resolved(id); return resolved(id);
} else {
if (!FeatureFlags.uuids() && FeatureFlags.groupsV2()) {
throw new RuntimeException(new UuidRecipientError());
} else { } else {
throw new UuidRecipientError(); throw new UuidRecipientError();
} }
}
} else if (e164 != null) { } else if (e164 != null) {
Recipient recipient = resolved(db.getOrInsertFromE164(e164)); Recipient recipient = resolved(db.getOrInsertFromE164(e164));
@ -271,10 +275,14 @@ public class Recipient {
if (possibleId.isPresent()) { if (possibleId.isPresent()) {
id = possibleId.get(); id = possibleId.get();
} else {
if (!FeatureFlags.uuids() && FeatureFlags.groupsV2()) {
throw new RuntimeException(new UuidRecipientError());
} else { } else {
throw new UuidRecipientError(); throw new UuidRecipientError();
} }
} }
}
} else if (GroupId.isEncodedGroup(identifier)) { } else if (GroupId.isEncodedGroup(identifier)) {
id = db.getOrInsertFromGroupId(GroupId.parseOrThrow(identifier)); id = db.getOrInsertFromGroupId(GroupId.parseOrThrow(identifier));
} else if (NumberUtil.isValidEmail(identifier)) { } else if (NumberUtil.isValidEmail(identifier)) {