1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00

Android: Fixes #4439: Add option to disable TLS validation and allow self-signed certificates for WebDAV/NextCloud (#4742)

This commit is contained in:
Roman Musin
2021-04-25 09:50:52 +01:00
committed by GitHub
parent 3235f58f5a
commit a4854fcde8
17 changed files with 186 additions and 9 deletions

View File

@@ -1025,10 +1025,11 @@ class Setting extends BaseModel {
advanced: true,
section: 'sync',
show: (settings: any) => {
return [SyncTargetRegistry.nameToId('nextcloud'), SyncTargetRegistry.nameToId('webdav'), SyncTargetRegistry.nameToId('joplinServer')].indexOf(settings['sync.target']) >= 0;
return (shim.isNode() || shim.mobilePlatform() === 'android') &&
[SyncTargetRegistry.nameToId('nextcloud'), SyncTargetRegistry.nameToId('webdav'), SyncTargetRegistry.nameToId('joplinServer')].indexOf(settings['sync.target']) >= 0;
},
public: true,
appTypes: ['desktop', 'cli'],
appTypes: ['desktop', 'cli', 'mobile'],
label: () => _('Ignore TLS certificate errors'),
storage: SettingStorage.File,
},