Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-27 05:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate Keys.storageService sync field

Browse Source
This commit is contained in:
Fedor Indutny
2024-11-12 11:36:58 -08:00
committed by GitHub
parent 8772880ca1
commit fbf39a36fb
4 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ts/background.ts
View File

@@ -3276,7 +3276,6 @@ export async function startApp(): Promise<void> {
ev.confirm();
const { accountEntropyPool, masterKey, mediaRootBackupKey } = ev;
let { storageServiceKey } = ev;
const prevMasterKeyBase64 = window.storage.get('masterKey');
const prevMasterKey = prevMasterKeyBase64
@@ -3314,7 +3313,6 @@ export async function startApp(): Promise<void> {
log.info('onKeysSync: updating masterKey');
}
// Override provided storageServiceKey because it is deprecated.
storageServiceKey = deriveStorageServiceKey(derivedMasterKey);
await window.storage.put('masterKey', Bytes.toBase64(derivedMasterKey));
}
@@ -3331,12 +3329,8 @@ export async function startApp(): Promise<void> {
await window.storage.put('backupMediaRootKey', mediaRootBackupKey);
}
if (storageServiceKey == null) {
log.warn('onKeysSync: deleting window.storageKey');
await window.storage.remove('storageKey');
}
if (storageServiceKey) {
if (derivedMasterKey != null) {
const storageServiceKey = deriveStorageServiceKey(derivedMasterKey);
const storageServiceKeyBase64 = Bytes.toBase64(storageServiceKey);
if (window.storage.get('storageKey') === storageServiceKeyBase64) {
log.info(