Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-19 13:18:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to libsignal v0.86.6

Browse Source
This commit is contained in:
Jordan Rose
2025-12-05 08:01:38 -08:00
committed by GitHub
parent 31d6ac71a4
commit 730e0205f8
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/org/whispersystems/textsecuregcm/push/MessageSender.java
View File

@@ -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<Byte, Integer> 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 ->

4
service/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java
View File

@@ -7,8 +7,8 @@ package org.whispersystems.textsecuregcm.util;
import java.util.Map;
public record Pair<T1, T2>(T1 first, T2 second) {
public Pair(org.signal.libsignal.protocol.util.Pair<T1, T2> p) {
this(p.first(), p.second());
public Pair(kotlin.Pair<T1, T2> p) {
this(p.getFirst(), p.getSecond());
}
public Pair(Map.Entry<T1, T2> e) {