From 8c6a88374b89feb58f68559894f4777ffd5dda09 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Tue, 18 May 2021 12:13:11 -0400 Subject: [PATCH] No longer use SignalServiceAddress legacy identifier. We had to do this in the past because we previously didn't allow UUID-only contacts back in the day. This hasn't been the case for some time. We should be preferring the UUID in all cases. --- .../signalservice/api/crypto/SignalServiceCipher.java | 2 +- .../signalservice/api/push/SignalServiceAddress.java | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java index 635b80247..612ace18c 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java @@ -234,7 +234,7 @@ public class SignalServiceCipher { } else if (e164Address != null && store.containsSession(e164Address)) { return e164Address; } else { - return new SignalProtocolAddress(address.getLegacyIdentifier(), sourceDevice); + return new SignalProtocolAddress(address.getIdentifier(), sourceDevice); } } 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 b8013853d..3359e021a 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 @@ -69,16 +69,6 @@ public class SignalServiceAddress { } } - public String getLegacyIdentifier() { - if (e164.isPresent()) { - return e164.get(); - } else if (uuid.isPresent()) { - return uuid.get().toString(); - } else { - throw new AssertionError("Given the checks in the constructor, this should not be possible."); - } - } - public Optional getRelay() { return relay; }