Reduce amount of folder timers and improve autoLogout

dev/App/User.js

@@ -126,14 +126,12 @@ class AppUser extends AbstractApp {
 			}, 1000);
 		}
 
-		const refresh = (()=>dispatchEvent(new CustomEvent('rl.auto-logout-refresh'))).debounce(5000),
+		const fn = (ev=>$htmlCL.toggle('rl-ctrl-key-pressed', ev.ctrlKey)).debounce(500);
-			fn = (ev=>{
+		['keydown','keyup'].forEach(t => doc.addEventListener(t, fn));
-				$htmlCL.toggle('rl-ctrl-key-pressed', ev.ctrlKey);
-				refresh();
-			}).debounce(500);
 
-//		doc.addEventListener('touchstart', fn, {passive:true});
+		['touchstart','mousedown','mousemove','keydown'].forEach(
-		['mousedown','keydown','keyup'/*,'mousemove'*/].forEach(t => doc.addEventListener(t, fn));
+			t => doc.addEventListener(t, SettingsStore.delayLogout, {passive:true})
+		);
 
 		shortcuts.add('escape,enter', '', KeyState.All, () => rl.Dropdowns.detectVisibility());
 	}
@@ -400,13 +398,7 @@ class AppUser extends AbstractApp {
 	 * @param {Function=} callback = null
 	 */
 	foldersReload(callback = null) {
-		const prom = Remote.foldersReload(FolderStore.foldersLoading);
+		Remote.foldersReload(callback);
-		if (callback) {
-			prom
-				.then((value) => !!value)
-				.then(callback)
-				.catch(() => callback && setTimeout(() => callback(false), 1));
-		}
 	}
 
 	foldersPromisesActionHelper(promise, errorDefCode) {
@@ -414,12 +406,10 @@ class AppUser extends AbstractApp {
 			.fastResolve(true)
 			.then(() => promise)
 			.then(
-				() => {
+				Remote.foldersReloadWithTimeout,
-					Remote.foldersReloadWithTimeout(FolderStore.foldersLoading);
+				errorCode => {
-				},
-				(errorCode) => {
 					FolderStore.folderListError(getNotification(errorCode, '', errorDefCode));
-					Remote.foldersReloadWithTimeout(FolderStore.foldersLoading);
+					Remote.foldersReloadWithTimeout();
 				}
 			);
 	}
@@ -982,16 +972,20 @@ class AppUser extends AbstractApp {
 								// false ? AboutUserScreen : null
 							]);
 
-							setInterval(() => this.folderInformation(getFolderInboxName()), 120000);
+							// Every 5 minutes
 							setInterval(() => {
-								const sF = FolderStore.currentFolderFullNameRaw();
+								const cF = FolderStore.currentFolderFullNameRaw(),
-								if (getFolderInboxName() !== sF) {
+									iF = getFolderInboxName();
-									this.folderInformation(sF);
+								this.folderInformation(iF);
+								if (iF !== cF) {
+									this.folderInformation(cF);
 								}
-							}, 180000);
+								this.folderInformationMultiply();
+							}, 300000);
 
-							setTimeout(() => setInterval(this.folderInformationMultiply, 120000), 300000);
+							// Every 15 minutes
 							setInterval(this.quota, 900000);
+							// Every 20 minutes
 							setInterval(this.foldersReload, 1200000);
 
 							setTimeout(this.contactsSync, 10000);
@@ -999,23 +993,19 @@ class AppUser extends AbstractApp {
 							contactsSyncInterval = 320 >= contactsSyncInterval ? contactsSyncInterval : 320;
 							setInterval(this.contactsSync, contactsSyncInterval * 60000 + 5000);
 
-							setTimeout(() => this.folderInformationMultiply(true), 2000);
-
-
 							this.accountsAndIdentities(true);
 
 							setTimeout(() => {
-								const sF = FolderStore.currentFolderFullNameRaw();
+								const cF = FolderStore.currentFolderFullNameRaw();
-								if (getFolderInboxName() !== sF) {
+								if (getFolderInboxName() !== cF) {
-									this.folderInformation(sF);
+									this.folderInformation(cF);
 								}
+								this.folderInformationMultiply(true);
 							}, 1000);
 
 							setTimeout(this.quota, 5000);
 							setTimeout(() => Remote.appDelayStart(()=>{}), 35000);
 
-							addEventListener('rl.auto-logout', () => this.logout());
-
 							if (
 								!!Settings.get('AccountSignMe') &&
 								navigator.registerProtocolHandler &&
@@ -1026,7 +1016,7 @@ class AppUser extends AbstractApp {
 										navigator.registerProtocolHandler(
 											'mailto',
 											location.protocol + '//' + location.host + location.pathname + '?mailto&to=%s',
-											'' + (Settings.get('Title') || 'SnappyMail')
+											(Settings.get('Title') || 'SnappyMail')
 										);
 									} catch (e) {} // eslint-disable-line no-empty
 

dev/Remote/User/Fetch.js

@@ -12,7 +12,7 @@ import { SUB_QUERY_PREFIX } from 'Common/Links';
 
 import AppStore from 'Stores/User/App';
 import SettingsStore from 'Stores/User/Settings';
-//import FolderStore from 'Stores/User/Folder';
+import FolderStore from 'Stores/User/Folder';
 
 import { AbstractFetchRemote } from 'Remote/AbstractFetch';
 
@@ -771,43 +771,39 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		this.defaultRequest(fCallback, 'ClearUserBackground');
 	}
 
-	// FolderStore.foldersLoading
+	foldersReload(fCallback) {
-	foldersReload(fTrigger) {
+		this.abort('Folders')
-		return this.abort('Folders')
+			.postRequest('Folders', FolderStore.foldersLoading)
-			.postRequest('Folders', fTrigger)
 			.then(data => {
 				data = FolderCollectionModel.reviveFromJson(data.Result);
 				data && data.storeIt();
-				return true;
+				fCallback && fCallback(true);
-			});
+			})
+			.catch(() => fCallback && setTimeout(() => fCallback(false), 1));
 	}
 
-	// FolderStore.foldersLoading
+	foldersReloadWithTimeout() {
-	foldersReloadWithTimeout(fTrigger) {
+		this.setTrigger(FolderStore.foldersLoading, true);
-		this.setTrigger(fTrigger, true);
 
 		clearTimeout(this.foldersTimeout);
-		this.foldersTimeout = setTimeout(() => this.foldersReload(fTrigger), 500);
+		this.foldersTimeout = setTimeout(() => this.foldersReload(), 500);
 	}
 
-	// FolderStore.foldersDeleting
+	folderDelete(sFolderFullNameRaw) {
-	folderDelete(sFolderFullNameRaw, fTrigger) {
+		return this.postRequest('FolderDelete', FolderStore.foldersDeleting, {
-		return this.postRequest('FolderDelete', fTrigger, {
 			Folder: sFolderFullNameRaw
 		});
 	}
 
-	// FolderStore.foldersCreating
+	folderCreate(sNewFolderName, sParentName) {
-	folderCreate(sNewFolderName, sParentName, fTrigger) {
+		return this.postRequest('FolderCreate', FolderStore.foldersCreating, {
-		return this.postRequest('FolderCreate', fTrigger, {
 			Folder: sNewFolderName,
 			Parent: sParentName
 		});
 	}
 
-	// FolderStore.foldersRenaming
+	folderRename(sPrevFolderFullNameRaw, sNewFolderName) {
-	folderRename(sPrevFolderFullNameRaw, sNewFolderName, fTrigger) {
+		return this.postRequest('FolderRename', FolderStore.foldersRenaming, {
-		return this.postRequest('FolderRename', fTrigger, {
 			Folder: sPrevFolderFullNameRaw,
 			NewFolderName: sNewFolderName
 		});

dev/Settings/User/Folders.js

@@ -45,7 +45,7 @@ export class FoldersUserSettings {
 			Local.set(ClientSideKeyName.FoldersLashHash, '');
 
 			rl.app.foldersPromisesActionHelper(
-				Remote.folderRename(folder.fullNameRaw, nameToEdit, FolderStore.foldersRenaming),
+				Remote.folderRename(folder.fullNameRaw, nameToEdit),
 				Notification.CantRenameFolder
 			);
 
@@ -101,7 +101,7 @@ export class FoldersUserSettings {
 				FolderStore.folderList.remove(fRemoveFolder);
 
 				rl.app.foldersPromisesActionHelper(
-					Remote.folderDelete(folderToRemove.fullNameRaw, FolderStore.foldersDeleting),
+					Remote.folderDelete(folderToRemove.fullNameRaw),
 					Notification.CantDeleteFolder
 				);
 

dev/Stores/User/Settings.js

@@ -3,13 +3,11 @@ import ko from 'ko';
 import { MESSAGES_PER_PAGE_VALUES } from 'Common/Consts';
 import { Layout, EditorDefaultType } from 'Common/EnumsUser';
 import { pInt } from 'Common/Utils';
-import { $htmlCL } from 'Common/Globals';
+import { $htmlCL, Settings } from 'Common/Globals';
 import { ThemeStore } from 'Stores/Theme';
 
 class SettingsUserStore {
 	constructor() {
-		this.iAutoLogoutTimer = 0;
-
 		this.layout = ko
 			.observable(Layout.SidePreview)
 			.extend({ limitedList: [Layout.SidePreview, Layout.BottomPreview, Layout.NoPreview] });
@@ -39,6 +37,17 @@ class SettingsUserStore {
 		this.usePreviewPane = ko.computed(() => Layout.NoPreview !== this.layout() && !ThemeStore.isMobile());
 
 		this.subscribers();
+
+		let iAutoLogoutTimer;
+		this.delayLogout = (() => {
+			clearTimeout(iAutoLogoutTimer);
+			if (0 < this.autoLogout() && !Settings.get('AccountSignMe')) {
+				iAutoLogoutTimer = setTimeout(
+					rl.app.logout,
+					this.autoLogout() * 60000
+				);
+			}
+		}).throttle(5000);
 	}
 
 	subscribers() {
@@ -51,7 +60,7 @@ class SettingsUserStore {
 	}
 
 	populate() {
-		const settingsGet = rl.settings.get;
+		const settingsGet = Settings.get;
 		this.layout(pInt(settingsGet('Layout')));
 		this.editorDefaultType(settingsGet('EditorDefaultType'));
 
@@ -65,16 +74,7 @@ class SettingsUserStore {
 		this.useThreads(!!settingsGet('UseThreads'));
 		this.replySameFolder(!!settingsGet('ReplySameFolder'));
 
-		const refresh = () => {
+		this.delayLogout();
-			clearTimeout(this.iAutoLogoutTimer);
-			if (0 < this.autoLogout() && !settingsGet('AccountSignMe')) {
-				this.iAutoLogoutTimer = setTimeout(() =>
-					dispatchEvent(new CustomEvent('rl.auto-logout'))
-				, this.autoLogout() * 60000);
-			}
-		};
-		addEventListener('rl.auto-logout-refresh', refresh);
-		refresh();
 	}
 }
 

dev/View/Popup/FolderCreate.js

@@ -53,7 +53,7 @@ class FolderCreatePopupView extends AbstractViewPopup {
 		}
 
 		rl.app.foldersPromisesActionHelper(
-			Remote.folderCreate(this.folderName(), parentFolderName, FolderStore.foldersCreating),
+			Remote.folderCreate(this.folderName(), parentFolderName),
 			Notification.CantCreateFolder
 		);