self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-27 23:28:38 +02:00
Code Issues Releases Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/lib/components/shared/config-shared.js
View File

@ -25,7 +25,11 @@ shared.advancedSettingsButton_click = (comp) => {
shared.checkSyncConfig = async function(comp, settings) {
const syncTargetId = settings['sync.target'];
const SyncTargetClass = SyncTargetRegistry.classById(syncTargetId);
const options = Setting.subValues(`sync.${syncTargetId}`, settings);
const options = Object.assign({},
Setting.subValues(`sync.${syncTargetId}`, settings),
Setting.subValues('net', settings));
comp.setState({ checkSyncConfigResult: 'checking' });
const result = await SyncTargetClass.checkConfig(ObjectUtils.convertValuesToFunctions(options));
comp.setState({ checkSyncConfigResult: result });
@ -35,6 +39,7 @@ shared.checkSyncConfig = async function(comp, settings) {
// Users often expect config to be auto-saved at this point, if the config check was successful
shared.saveSettings(comp);
}
return result;
};
shared.checkSyncConfigMessages = function(comp) {