Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-02 14:43:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with stale linked devices when changing number.

Browse Source
This commit is contained in:
Cody Henthorne
2022-09-08 09:56:41 -04:00
committed by Greyson Parrelli
parent 24b7593178
commit ca0e52e141
12 changed files with 251 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@@ -2235,6 +2235,12 @@ public class SignalServiceMessageSender {
archiveSessions(recipient, staleDevices.getStaleDevices());
}
public void handleChangeNumberMismatchDevices(@Nonnull MismatchedDevices mismatchedDevices)
throws IOException, UntrustedIdentityException
{
handleMismatchedDevices(socket, localAddress, mismatchedDevices);
}
private void archiveSessions(SignalServiceAddress recipient, List<Integer> devices) {
List<SignalProtocolAddress> addressesToClear = convertToProtocolAddresses(recipient, devices);

4
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/MismatchedDevices.java
View File

@@ -12,10 +12,10 @@ import java.util.List;
public class MismatchedDevices {
@JsonProperty
private List<Integer> missingDevices;
public List<Integer> missingDevices;
@JsonProperty
private List<Integer> extraDevices;
public List<Integer> extraDevices;
public List<Integer> getMissingDevices() {
return missingDevices;

2
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessage.java
View File

@@ -20,6 +20,8 @@ public class OutgoingPushMessage {
@JsonProperty
private String content;
public OutgoingPushMessage() {}
public OutgoingPushMessage(int type,
int destinationDeviceId,
int destinationRegistrationId,

4
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java
View File

@@ -20,10 +20,10 @@ public class PreKeyResponse {
@JsonProperty
@JsonSerialize(using = JsonUtil.IdentityKeySerializer.class)
@JsonDeserialize(using = JsonUtil.IdentityKeyDeserializer.class)
private IdentityKey identityKey;
public IdentityKey identityKey;
@JsonProperty
private List<PreKeyResponseItem> devices;
public List<PreKeyResponseItem> devices;
public IdentityKey getIdentityKey() {
return identityKey;

8
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponseItem.java
View File

@@ -13,16 +13,16 @@ import org.whispersystems.signalservice.api.push.SignedPreKeyEntity;
public class PreKeyResponseItem {
@JsonProperty
private int deviceId;
public int deviceId;
@JsonProperty
private int registrationId;
public int registrationId;
@JsonProperty
private SignedPreKeyEntity signedPreKey;
public SignedPreKeyEntity signedPreKey;
@JsonProperty
private PreKeyEntity preKey;
public PreKeyEntity preKey;
public int getDeviceId() {
return deviceId;