self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +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

2
packages/lib/services/synchronizer/syncInfoUtils.ts
View File

@@ -4,7 +4,7 @@ import JoplinDatabase from '../../JoplinDatabase';
import Setting from '../../models/Setting';
import BaseItem from '../../models/BaseItem';
import { State } from '../../reducer';
import { PublicPrivateKeyPair } from '../e2ee/ppk';
import { PublicPrivateKeyPair } from '../e2ee/ppk/ppk';
import { MasterKeyEntity } from '../e2ee/types';
import { compareVersions } from 'compare-versions';
import { _ } from '../../locale';