self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

Desktop: Fixes #5086: Prevent app from crashing when loading a setting value that has been removed

Browse Source
This commit is contained in:
Laurent Cozic
2021-06-16 18:22:32 +01:00
parent 8c56cf98be
commit 313c8bbe8c
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/lib/models/Setting.test.ts
View File

@ -30,6 +30,24 @@ describe('models_Setting', function() {
expect('username' in output).toBe(false); expect('username' in output).toBe(false);
})); }));
it('should not fail when trying to load a key that no longer exist from the setting file', (async () => {
// To handle the case where a setting value exists in the database but
// the metadata has been removed in a new Joplin version.
// https://github.com/laurent22/joplin/issues/5086
Setting.setValue('sync.target', 9); // Saved to file
await Setting.saveAll();
const settingValues = await Setting.fileHandler.load();
settingValues['itsgone'] = 'myvalue';
await Setting.fileHandler.save(settingValues);
await Setting.reset();
await expectNotThrow(async () => Setting.load());
await expectThrow(async () => Setting.value('itsgone'));
}));
it('should allow registering new settings dynamically', (async () => { it('should allow registering new settings dynamically', (async () => {
await expectThrow(async () => Setting.setValue('myCustom', '123')); await expectThrow(async () => Setting.setValue('myCustom', '123'));

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

@ -232,7 +232,7 @@ class Setting extends BaseModel {
return `${this.value('profileDir')}/settings.json`; return `${this.value('profileDir')}/settings.json`;
} }
private static get fileHandler(): FileHandler { public static get fileHandler(): FileHandler {
if (!this.fileHandler_) { if (!this.fileHandler_) {
this.fileHandler_ = new FileHandler(this.settingFilePath); this.fileHandler_ = new FileHandler(this.settingFilePath);
} }
@ -1405,7 +1405,7 @@ class Setting extends BaseModel {
for (const k of Object.keys(fromFile)) { for (const k of Object.keys(fromFile)) {
itemsFromFile.push({ itemsFromFile.push({
key: k, key: k,
value: this.filterValue(k, this.formatValue(k, fromFile[k])), value: fromFile[k],
}); });
} }
} }