self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

All: Also allow disabling TLS errors for Joplin Cloud to go around error UNABLE_TO_GET_ISSUER_CERT_LOCALLY

Browse Source
This commit is contained in:
Laurent Cozic 2021-06-23 11:37:50 +01:00
parent 46868e6b25
commit 118a2f9f25
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/lib/models/Setting.ts
View File

@ -1117,7 +1117,11 @@ class Setting extends BaseModel {
section: 'sync', section: 'sync',
advanced: true, advanced: true,
show: (settings: any) => { show: (settings: any) => {
return [SyncTargetRegistry.nameToId('nextcloud'), SyncTargetRegistry.nameToId('webdav'), SyncTargetRegistry.nameToId('joplinServer')].indexOf(settings['sync.target']) >= 0; return [
SyncTargetRegistry.nameToId('nextcloud'),
SyncTargetRegistry.nameToId('webdav'),
SyncTargetRegistry.nameToId('joplinServer'),
].indexOf(settings['sync.target']) >= 0;
}, },
public: true, public: true,
appTypes: [AppType.Desktop, AppType.Cli], appTypes: [AppType.Desktop, AppType.Cli],
@ -1132,7 +1136,16 @@ class Setting extends BaseModel {
section: 'sync', section: 'sync',
show: (settings: any) => { show: (settings: any) => {
return (shim.isNode() || shim.mobilePlatform() === 'android') && return (shim.isNode() || shim.mobilePlatform() === 'android') &&
[SyncTargetRegistry.nameToId('nextcloud'), SyncTargetRegistry.nameToId('webdav'), SyncTargetRegistry.nameToId('joplinServer')].indexOf(settings['sync.target']) >= 0; [
SyncTargetRegistry.nameToId('nextcloud'),
SyncTargetRegistry.nameToId('webdav'),
SyncTargetRegistry.nameToId('joplinServer'),
// Needs to be enabled for Joplin Cloud too because
// some companies filter all traffic and swap TLS
// certificates, which result in error
// UNABLE_TO_GET_ISSUER_CERT_LOCALLY
SyncTargetRegistry.nameToId('joplinCloud'),
].indexOf(settings['sync.target']) >= 0;
}, },
public: true, public: true,
label: () => _('Ignore TLS certificate errors'), label: () => _('Ignore TLS certificate errors'),