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

Update Account#getNextDeviceId to not reuse disable device’s IDs

Browse Source
This commit is contained in:
Chris Eager
2021-09-09 17:52:45 -07:00
committed by Chris Eager
parent 016141a05d
commit 23a076a204
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
service/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java
View File

@@ -212,17 +212,13 @@ public class Account {
public long getNextDeviceId() {
requireNotStale();
long highestDevice = Device.MASTER_ID;
long candidateId = Device.MASTER_ID + 1;
for (Device device : devices) {
if (!device.isEnabled()) {
return device.getId();
} else if (device.getId() > highestDevice) {
highestDevice = device.getId();
}
while (getDevice(candidateId).isPresent()) {
candidateId++;
}
return highestDevice + 1;
return candidateId;
}
public int getEnabledDeviceCount() {