diff --git a/pom.xml b/pom.xml index d7715eca6..c8cabeb1d 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,14 @@ false + + signal-build-artifacts + Signal Build Artifacts + https://build-artifacts.signal.org/libraries/maven + + false + + @@ -286,7 +294,7 @@ org.signal libsignal-server - 0.80.3 + 0.86.6 org.signal diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/push/MessageSender.java b/service/src/main/java/org/whispersystems/textsecuregcm/push/MessageSender.java index 2921366d4..9a3a7332b 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/push/MessageSender.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/MessageSender.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import javax.annotation.Nullable; +import kotlin.Pair; import org.apache.commons.lang3.StringUtils; import org.signal.libsignal.protocol.SealedSenderMultiRecipientMessage; -import org.signal.libsignal.protocol.util.Pair; import org.whispersystems.textsecuregcm.controllers.MismatchedDevices; import org.whispersystems.textsecuregcm.controllers.MismatchedDevicesException; import org.whispersystems.textsecuregcm.controllers.MultiRecipientMismatchedDevicesException; @@ -186,7 +186,7 @@ public class MessageSender { final ServiceIdentifier serviceIdentifier = ServiceIdentifier.fromLibsignal(serviceId); final Map registrationIdsByDeviceId = recipient.getDevicesAndRegistrationIds() - .collect(Collectors.toMap(Pair::first, pair -> (int) pair.second())); + .collect(Collectors.toMap(Pair::getFirst, pair -> (int) pair.getSecond())); getMismatchedDevices(account, serviceIdentifier, registrationIdsByDeviceId, NO_EXCLUDED_DEVICE_ID) .ifPresent(mismatchedDevices -> diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java b/service/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java index 70fab8a98..384a5c1c0 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java @@ -7,8 +7,8 @@ package org.whispersystems.textsecuregcm.util; import java.util.Map; public record Pair(T1 first, T2 second) { - public Pair(org.signal.libsignal.protocol.util.Pair p) { - this(p.first(), p.second()); + public Pair(kotlin.Pair p) { + this(p.getFirst(), p.getSecond()); } public Pair(Map.Entry e) {