webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure profile key is stored in profileKeyStore

Browse source 
Fixes #1362
This commit is contained in:
AsamK 2023-11-03 20:20:14 +01:00
parent 41bff4a0a7
commit 250f89389e
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
graalvm-config-dir/resource-config.json
View file

@ -170,6 +170,8 @@
"pattern":"\\Qkotlin/coroutines/coroutines.kotlin_builtins\\E" "pattern":"\\Qkotlin/coroutines/coroutines.kotlin_builtins\\E"
}, { }, {
"pattern":"\\Qkotlin/internal/internal.kotlin_builtins\\E" "pattern":"\\Qkotlin/internal/internal.kotlin_builtins\\E"
}, {
"pattern":"\\Qkotlin/jvm/jvm.kotlin_builtins\\E"
}, { }, {
"pattern":"\\Qkotlin/kotlin.kotlin_builtins\\E" "pattern":"\\Qkotlin/kotlin.kotlin_builtins\\E"
}, { }, {

12
lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
View file

@ -654,7 +654,7 @@ public class SignalAccount implements Closeable {
// Old config file, creating new profile key // Old config file, creating new profile key
setProfileKey(KeyUtils.createProfileKey()); setProfileKey(KeyUtils.createProfileKey());
} }
getProfileStore().storeProfileKey(getSelfRecipientId(), getProfileKey()); getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
if (previousStorageVersion < 5) { if (previousStorageVersion < 5) {
final var legacyRecipientsStoreFile = new File(userPath, "recipients-store"); final var legacyRecipientsStoreFile = new File(userPath, "recipients-store");
@ -1185,10 +1185,12 @@ public class SignalAccount implements Closeable {
} }
public RecipientStore getRecipientStore() { public RecipientStore getRecipientStore() {
return getOrCreate(() -> recipientStore, return getOrCreate(() -> recipientStore, () -> {
() -> recipientStore = new RecipientStore(this::mergeRecipients, recipientStore = new RecipientStore(this::mergeRecipients,
this::getSelfRecipientAddress, this::getSelfRecipientAddress,
getAccountDatabase())); getAccountDatabase());
getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
});
} }
public ProfileStore getProfileStore() { public ProfileStore getProfileStore() {