diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java index da7b4f696..9054c3e27 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java @@ -712,13 +712,6 @@ public final class SignalServiceContent { List addresses = new ArrayList<>(numbers.size() + uuids.size()); List groupIds = new ArrayList<>(content.getBlocked().getGroupIdsList().size()); - for (String e164 : numbers) { - Optional address = SignalServiceAddress.fromRaw(null, e164); - if (address.isPresent()) { - addresses.add(address.get()); - } - } - for (String uuid : uuids) { Optional address = SignalServiceAddress.fromRaw(uuid, null); if (address.isPresent()) { diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java index df908efaf..79ebde4fa 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java @@ -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 fromRaw(String rawUuid, String e164) {