nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-05-26 14:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle missing storage manifest version correctly

Browse Source 
Fixes #1829
This commit is contained in:
AsamK 2025-09-14 17:31:31 +02:00
parent 2239231601
commit b9008f0b66
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
View File

@ -18,6 +18,7 @@ import org.signal.core.util.SetUtil;
import org.signal.libsignal.protocol.InvalidKeyException; import org.signal.libsignal.protocol.InvalidKeyException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
import org.whispersystems.signalservice.api.storage.RecordIkm; import org.whispersystems.signalservice.api.storage.RecordIkm;
import org.whispersystems.signalservice.api.storage.SignalStorageManifest; import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
import org.whispersystems.signalservice.api.storage.SignalStorageRecord; import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
@ -348,8 +349,12 @@ public class StorageHelper {
) throws IOException, RetryLaterException { ) throws IOException, RetryLaterException {
logger.debug("Force pushing local state to remote storage"); logger.debug("Force pushing local state to remote storage");
final var currentVersion = handleResponseException(dependencies.getStorageServiceRepository() long currentVersion;
.getManifestVersion()); try {
currentVersion = handleResponseException(dependencies.getStorageServiceRepository().getManifestVersion());
} catch (NotFoundException e) {
currentVersion = 0;
}
final var newVersion = currentVersion + 1; final var newVersion = currentVersion + 1;
final var newStorageRecords = new ArrayList<SignalStorageRecord>(); final var newStorageRecords = new ArrayList<SignalStorageRecord>();
final Map<RecipientId, StorageId> newContactStorageIds; final Map<RecipientId, StorageId> newContactStorageIds;