Improve Settings handling

This commit is contained in:
djmaze 2021-03-10 11:44:48 +01:00
parent e7b1ce7509
commit 34b25eedea
39 changed files with 160 additions and 150 deletions

View file

@ -1,4 +1,5 @@
import { StorageResultType, Notification } from 'Common/Enums';
import { Settings } from 'Common/Globals';
import { pInt, pString } from 'Common/Utils';
import { serverRequest } from 'Common/Links';
@ -11,7 +12,7 @@ const getURL = (add = '') => serverRequest('Json') + add,
updateToken = data => {
if (data.UpdateToken) {
rl.hash.set();
rl.settings.set('AuthAccountHash', data.UpdateToken);
Settings.set('AuthAccountHash', data.UpdateToken);
}
},

View file

@ -8,6 +8,7 @@ import {
MessageFlagsCache
} from 'Common/Cache';
import { SettingsGet } from 'Common/Globals';
import { SUB_QUERY_PREFIX } from 'Common/Links';
import AppStore from 'Stores/User/App';
@ -31,16 +32,15 @@ class RemoteUserFetch extends AbstractFetchRemote {
* @param {?Function} fCallback
*/
folders(fCallback) {
const settingsGet = rl.settings.get;
this.defaultRequest(
fCallback,
'Folders',
{
SentFolder: settingsGet('SentFolder'),
DraftFolder: settingsGet('DraftFolder'),
SpamFolder: settingsGet('SpamFolder'),
TrashFolder: settingsGet('TrashFolder'),
ArchiveFolder: settingsGet('ArchiveFolder')
SentFolder: SettingsGet('SentFolder'),
DraftFolder: SettingsGet('DraftFolder'),
SpamFolder: SettingsGet('SpamFolder'),
TrashFolder: SettingsGet('TrashFolder'),
ArchiveFolder: SettingsGet('ArchiveFolder')
},
null,
'',