Allow requesting profile without profileKey
This commit is contained in:
parent
80e445389f
commit
4a00ea46bc
7 changed files with 354 additions and 208 deletions
|
@ -1140,16 +1140,16 @@ export async function mergeAccountRecord(
|
|||
});
|
||||
|
||||
let needsProfileFetch = false;
|
||||
if (accountRecord.profileKey && accountRecord.profileKey.length > 0) {
|
||||
if (profileKey && profileKey.length > 0) {
|
||||
needsProfileFetch = await conversation.setProfileKey(
|
||||
Bytes.toBase64(accountRecord.profileKey),
|
||||
Bytes.toBase64(profileKey),
|
||||
{ viaStorageServiceSync: true }
|
||||
);
|
||||
}
|
||||
|
||||
if (avatarUrl) {
|
||||
await conversation.setProfileAvatar(avatarUrl);
|
||||
window.storage.put('avatarUrl', avatarUrl);
|
||||
if (avatarUrl) {
|
||||
await conversation.setProfileAvatar(avatarUrl, profileKey);
|
||||
window.storage.put('avatarUrl', avatarUrl);
|
||||
}
|
||||
}
|
||||
|
||||
const { hasConflict, details: extraDetails } = doesRecordHavePendingChanges(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue