Fix crash during block list parsing.

fork-5.53.8
Greyson Parrelli 2021-08-26 09:51:28 -04:00
rodzic b41e602539
commit b21abb8e7e
2 zmienionych plików z 1 dodań i 8 usunięć

Wyświetl plik

@ -712,13 +712,6 @@ public final class SignalServiceContent {
List<SignalServiceAddress> addresses = new ArrayList<>(numbers.size() + uuids.size());
List<byte[]> groupIds = new ArrayList<>(content.getBlocked().getGroupIdsList().size());
for (String e164 : numbers) {
Optional<SignalServiceAddress> address = SignalServiceAddress.fromRaw(null, e164);
if (address.isPresent()) {
addresses.add(address.get());
}
}
for (String uuid : uuids) {
Optional<SignalServiceAddress> address = SignalServiceAddress.fromRaw(uuid, null);
if (address.isPresent()) {

Wyświetl plik

@ -64,7 +64,7 @@ public class SignalServiceAddress {
}
public static boolean isValidAddress(String rawUuid, String e164) {
return (e164 != null && !e164.isEmpty()) || UuidUtil.parseOrNull(rawUuid) != null;
return UuidUtil.parseOrNull(rawUuid) != null;
}
public static Optional<SignalServiceAddress> fromRaw(String rawUuid, String e164) {