Resolve CardDAV sync not working due to new login system #163

the-djmaze · Nov 24, 2021 · e27fb46 · e27fb46
1 parent 00ef26a
commit e27fb46
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/dev/App/User.js b/dev/App/User.js
@@ -720,6 +720,7 @@ class AppUser extends AbstractApp {
 			AccountUserStore.email(SettingsGet('Email'));
 
 			SettingsUserStore.init();
+			ContactUserStore.init();
 
 			this.foldersReload(value => {
 				try {

diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js
@@ -52,8 +52,6 @@ export const FolderUserStore = new class {
 
 		self.currentFolder = ko.observable(null).extend({ toggleSubscribeProperty: [self, 'selected'] });
 
-		self.sieveAllowFileintoInbox = !!SettingsGet('SieveAllowFileintoInbox');
-
 		addComputablesTo(self, {
 
 			draftFolderNotEnabled: () => !self.draftFolder() || UNUSED_OPTION_VALUE === self.draftFolder(),

diff --git a/dev/View/Popup/Filter.js b/dev/View/Popup/Filter.js
@@ -2,10 +2,10 @@ import ko from 'ko';
 
 import { FilterAction } from 'Model/Filter';
 import { FilterConditionField, FilterConditionType } from 'Model/FilterCondition';
+import { SettingsGet } from 'Common/Globals';
 import { defaultOptionsAfterRender } from 'Common/Utils';
 import { i18n, initOnStartOrLangChange } from 'Common/Translator';
 
-import { FolderUserStore } from 'Stores/User/Folder';
 import { SieveUserStore } from 'Stores/User/Sieve';
 
 import { decorateKoCommands } from 'Knoin/Knoin';
@@ -30,13 +30,12 @@ class FilterPopupView extends AbstractViewPopup {
 		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
 		this.folderSelectList = ko.computed(() =>
 			folderListOptionsBuilder(
-				[FolderUserStore.sieveAllowFileintoInbox ? '' : 'INBOX'],
+				[SettingsGet('SieveAllowFileintoInbox') ? '' : 'INBOX'],
 				[['', '']],
 				item => item ? item.localName() : ''
 			)
 		);
 
-
 		this.selectedFolderValue.subscribe(() => this.filter() && this.filter().actionValueError(false));
 
 		['actionTypeOptions','fieldOptions','typeOptions','typeOptionsSize','typeOptionsBody'].forEach(