self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

Desktop,Mobile,Cli: Support accepting shares with a new key format (#12829)

Browse Source
This commit is contained in:
Henry Heino
2025-09-08 15:56:40 -07:00
committed by GitHub
parent f77a20f5d5
commit fdde04ee85
38 changed files with 1166 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/lib/BaseApplication.ts
View File

@@ -51,10 +51,10 @@ import handleSyncStartupOperation from './services/synchronizer/utils/handleSync
import SyncTargetJoplinCloud from './SyncTargetJoplinCloud';
import { setAutoFreeze } from 'immer';
import { getEncryptionEnabled } from './services/synchronizer/syncInfoUtils';
import { loadMasterKeysFromSettings, migrateMasterPassword } from './services/e2ee/utils';
import { loadMasterKeysFromSettings, migrateMasterPassword, migratePpk } from './services/e2ee/utils';
import SyncTargetNone from './SyncTargetNone';
import { setRSA } from './services/e2ee/ppk';
import RSA from './services/e2ee/RSA.node';
import { setRSA } from './services/e2ee/ppk/ppk';
import RSA from './services/e2ee/ppk/RSA.node';
import Resource from './models/Resource';
import { ProfileConfig } from './services/profileConfig/types';
import initProfile from './services/profileConfig/initProfile';
@@ -780,6 +780,7 @@ export default class BaseApplication {
options.keychainEnabled ? [KeychainServiceDriverElectron, KeychainServiceDriverNode] : [],
);
await migrateMasterPassword();
await migratePpk();
await handleSyncStartupOperation();
appLogger.info(`Client ID: ${Setting.value('clientId')}`);