jody/joplin
1
0 Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2026-10-25 02:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Desktop: Sync: Apply changes to proxy settings immediately (#16222)

Browse Source
This commit is contained in:
Henry Heino authored and GitHub committed 2026-08-18 11:46:46 +01:00
1 parent 34ded63b0c
commit 36b7709072
1 file changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files
packages/lib/BaseApplication.ts
+7 -5
View File
@@ -76,6 +76,7 @@ import NoteLockKey from './services/noteLock/NoteLockKey';
import isNoteLockEnabled from './services/noteLock/isNoteLockEnabled';
import NoteLockSession from './services/noteLock/NoteLockSession';
import NoteLockService from './services/noteLock/NoteLockService';
import { BuiltInMetadataKeys } from './models/settings/builtInMetadata';
const appLogger: LoggerWrapper = Logger.create('App');
const perfLogger = PerformanceLogger.create();
@@ -373,7 +374,8 @@ export default class BaseApplication {
}
protected async applySettingsSideEffects(action: { type?: string; key?: string; keys?: string[] } = null) {
const sideEffects: Record<string, ()=> Promise<void>> = {
type SideEffects = Partial<Record<BuiltInMetadataKeys, ()=> Promise<void>>>;
const sideEffects: SideEffects = {
'dateFormat': async () => {
time.setLocale(Setting.value('locale'));
setTimeLocale(Setting.value('locale'));
@@ -456,18 +458,18 @@ export default class BaseApplication {
sideEffects['encryption.passwordCache'] = sideEffects['syncInfoCache'];
sideEffects['encryption.masterPassword'] = sideEffects['syncInfoCache'];
sideEffects['sync.maxConcurrentConnections'] = sideEffects['net.proxyEnabled'];
sideEffects['sync.proxyTimeout'] = sideEffects['net.proxyEnabled'];
sideEffects['sync.proxyUrl'] = sideEffects['net.proxyEnabled'];
sideEffects['net.proxyTimeout'] = sideEffects['net.proxyEnabled'];
sideEffects['net.proxyUrl'] = sideEffects['net.proxyEnabled'];
sideEffects['ai.chat.baseUrl'] = sideEffects['ai.chat.providerType'];
sideEffects['ai.chat.apiKey'] = sideEffects['ai.chat.providerType'];
sideEffects['ai.chat.model'] = sideEffects['ai.chat.providerType'];
if (action) {
const effect = sideEffects[action.key];
const effect = sideEffects[action.key as keyof SideEffects];
if (effect) await effect();
} else {
for (const key in sideEffects) {
await sideEffects[key]();
await sideEffects[key as keyof SideEffects]();
}
}
}