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

Fix incorrect sender key state for mismatch/stale devices.

Browse Source
This commit is contained in:
Cody Henthorne
2026-02-20 14:05:41 -05:00
parent e4928b0084
commit 093a79045d
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@@ -2924,6 +2924,11 @@ public class SignalServiceMessageSender {
Log.w(TAG, "[handleMismatchedDevices] Address: " + recipient.getIdentifier() + ", ExtraDevices: " + mismatchedDevices.getExtraDevices() + ", MissingDevices: " + mismatchedDevices.getMissingDevices());
archiveSessions(recipient, mismatchedDevices.getExtraDevices());
ArrayList<Integer> mismatchedDeviceIds = new ArrayList<>();
mismatchedDeviceIds.addAll(mismatchedDevices.getExtraDevices());
mismatchedDeviceIds.addAll(mismatchedDevices.getMissingDevices());
clearSenderKeySharedWith(recipient, mismatchedDeviceIds);
for (int missingDeviceId : mismatchedDevices.getMissingDevices()) {
PreKeyBundle preKey = NetworkResultUtil.toPreKeysLegacy(keysApi.getPreKey(recipient, missingDeviceId));
@@ -2942,6 +2947,7 @@ public class SignalServiceMessageSender {
private void handleStaleDevices(SignalServiceAddress recipient, StaleDevices staleDevices) {
Log.w(TAG, "[handleStaleDevices] Address: " + recipient.getIdentifier() + ", StaleDevices: " + staleDevices.getStaleDevices());
archiveSessions(recipient, staleDevices.getStaleDevices());
clearSenderKeySharedWith(recipient, staleDevices.getStaleDevices());
}
public void handleChangeNumberMismatchDevices(@Nonnull MismatchedDevices mismatchedDevices)
@@ -2958,6 +2964,10 @@ public class SignalServiceMessageSender {
}
}
private void clearSenderKeySharedWith(SignalServiceAddress recipient, List<Integer> deviceIds) {
aciStore.clearSenderKeySharedWith(convertToProtocolAddresses(recipient, deviceIds));
}
private List<SignalProtocolAddress> convertToProtocolAddresses(SignalServiceAddress recipient, List<Integer> devices) {
List<SignalProtocolAddress> addresses = new ArrayList<>(devices.size());