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

Make MessagesManager#clear asynchronous

Browse Source
This commit is contained in:
Jon Chambers
2023-08-08 11:03:34 -04:00
committed by Jon Chambers
parent 2c835b5c51
commit ccd860207b
7 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/main/java/org/whispersystems/textsecuregcm/controllers/DeviceController.java
View File

@@ -142,10 +142,10 @@ public class DeviceController {
final CompletableFuture<Void> deleteKeysFuture = keys.delete(account.getUuid(), deviceId);
messages.clear(account.getUuid(), deviceId);
messages.clear(account.getUuid(), deviceId).join();
account = accounts.update(account, a -> a.removeDevice(deviceId));
// ensure any messages that came in after the first clear() are also removed
messages.clear(account.getUuid(), deviceId);
messages.clear(account.getUuid(), deviceId).join();
deleteKeysFuture.join();
}
@@ -419,7 +419,7 @@ public class DeviceController {
keys.delete(a.getUuid(), device.getId()),
keys.delete(a.getPhoneNumberIdentifier(), device.getId()));
messages.clear(a.getUuid(), device.getId());
messages.clear(a.getUuid(), device.getId()).join();
deleteKeysFuture.join();