Ensure profile key is stored in profileKeyStore

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

View file

@ -170,6 +170,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"
}, {

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() {