marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 67d8ffcde5
commit 91e0d5164b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,6 +172,8 @@
"pattern":"\\Qkotlin/coroutines/coroutines.kotlin_builtins\\E"
}, {
"pattern":"\\Qkotlin/internal/internal.kotlin_builtins\\E"
}, {
"pattern":"\\Qkotlin/jvm/jvm.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
setProfileKey(KeyUtils.createProfileKey());
}
getProfileStore().storeProfileKey(getSelfRecipientId(), getProfileKey());
getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
if (previousStorageVersion < 5) {
final var legacyRecipientsStoreFile = new File(userPath, "recipients-store");
@ -1185,10 +1185,12 @@ public class SignalAccount implements Closeable {
}
public RecipientStore getRecipientStore() {
return getOrCreate(() -> recipientStore,
() -> recipientStore = new RecipientStore(this::mergeRecipients,
this::getSelfRecipientAddress,
getAccountDatabase()));
return getOrCreate(() -> recipientStore, () -> {
recipientStore = new RecipientStore(this::mergeRecipients,
this::getSelfRecipientAddress,
getAccountDatabase());
getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
});
}
public ProfileStore getProfileStore() {