Cleanup __APP__/getApp code

dev/View/User/AbstractSystemDropDown.js

@@ -7,9 +7,6 @@ import MessageStore from 'Stores/User/Message';
 import { Capa, KeyState } from 'Common/Enums';
 import { settings } from 'Common/Links';
 
-
-import { getApp } from 'Helper/Apps/User';
-
 import { showScreenPopup, setHash } from 'Knoin/Knoin';
 import { AbstractViewNext } from 'Knoin/AbstractViewNext';
 
@@ -80,7 +77,7 @@ class AbstractSystemDropDownUserView extends AbstractViewNext {
 	}
 
 	logoutClick() {
-		getApp().logout();
+		rl.app.logout();
 	}
 
 	onBuild() {

dev/View/User/MailBox/FolderList.js

@@ -10,8 +10,6 @@ import SettingsStore from 'Stores/User/Settings';
 import FolderStore from 'Stores/User/Folder';
 import MessageStore from 'Stores/User/Message';
 
-import { getApp } from 'Helper/Apps/User';
-
 import { view, ViewType, showScreenPopup, setHash } from 'Knoin/Knoin';
 import { AbstractViewNext } from 'Knoin/AbstractViewNext';
 
@@ -77,7 +75,7 @@ class FolderListMailBoxUserView extends AbstractViewNext {
 				if (folder) {
 					if (isMove) {
 						moveAction(false);
-						getApp().moveMessagesToFolder(
+						rl.app.moveMessagesToFolder(
 							FolderStore.currentFolderFullNameRaw(),
 							MessageStore.messageListCheckedOrSelectedUidsWithSubMails(),
 							folder.fullNameRaw,
@@ -111,7 +109,7 @@ class FolderListMailBoxUserView extends AbstractViewNext {
 				const folder = ko.dataFor(el);
 				if (folder) {
 					const collapsed = folder.collapsed();
-					getApp().setExpandedFolder(folder.fullNameHash, collapsed);
+					rl.app.setExpandedFolder(folder.fullNameHash, collapsed);
 
 					folder.collapsed(!collapsed);
 					event.preventDefault();
@@ -165,7 +163,7 @@ class FolderListMailBoxUserView extends AbstractViewNext {
 				folder = item && ko.dataFor(item);
 			if (folder) {
 				const collapsed = folder.collapsed();
-				getApp().setExpandedFolder(folder.fullNameHash, collapsed);
+				rl.app.setExpandedFolder(folder.fullNameHash, collapsed);
 				folder.collapsed(!collapsed);
 			}
 
@@ -193,7 +191,7 @@ class FolderListMailBoxUserView extends AbstractViewNext {
 		if (folder && folder.collapsed()) {
 			this.iDropOverTimer = setTimeout(() => {
 				folder.collapsed(false);
-				getApp().setExpandedFolder(folder.fullNameHash, true);
+				rl.app.setExpandedFolder(folder.fullNameHash, true);
 			}, 500);
 		}
 	}
@@ -231,7 +229,7 @@ class FolderListMailBoxUserView extends AbstractViewNext {
 				uids = ui.helper.rlUids;
 
 			if (fromFolderFullNameRaw && Array.isArray(uids)) {
-				getApp().moveMessagesToFolder(fromFolderFullNameRaw, uids, toFolder.fullNameRaw, copy);
+				rl.app.moveMessagesToFolder(fromFolderFullNameRaw, uids, toFolder.fullNameRaw, copy);
 			}
 		}
 	}

dev/View/User/MailBox/MessageList.js

@@ -37,8 +37,6 @@ import MessageStore from 'Stores/User/Message';
 
 import Remote from 'Remote/User/Fetch';
 
-import { getApp } from 'Helper/Apps/User';
-
 import { view, command, ViewType, showScreenPopup, setHash, popupVisibility } from 'Knoin/Knoin';
 import { AbstractViewNext } from 'Knoin/AbstractViewNext';
 
@@ -266,7 +264,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 	@command()
 	reloadCommand() {
 		if (!MessageStore.messageListCompleteLoadingThrottleForAnimation() && this.allowReload) {
-			getApp().reloadMessageList(false, true);
+			rl.app.reloadMessageList(false, true);
 		}
 	}
 
@@ -283,7 +281,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 	@command(canBeMovedHelper)
 	deleteWithoutMoveCommand() {
 		if (Settings.capa(Capa.DangerousActions)) {
-			getApp().deleteMessagesFromFolder(
+			rl.app.deleteMessagesFromFolder(
 				FolderType.Trash,
 				FolderStore.currentFolderFullNameRaw(),
 				MessageStore.messageListCheckedOrSelectedUidsWithSubMails(),
@@ -294,7 +292,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 
 	@command(canBeMovedHelper)
 	deleteCommand() {
-		getApp().deleteMessagesFromFolder(
+		rl.app.deleteMessagesFromFolder(
 			FolderType.Trash,
 			FolderStore.currentFolderFullNameRaw(),
 			MessageStore.messageListCheckedOrSelectedUidsWithSubMails(),
@@ -304,7 +302,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 
 	@command(canBeMovedHelper)
 	archiveCommand() {
-		getApp().deleteMessagesFromFolder(
+		rl.app.deleteMessagesFromFolder(
 			FolderType.Archive,
 			FolderStore.currentFolderFullNameRaw(),
 			MessageStore.messageListCheckedOrSelectedUidsWithSubMails(),
@@ -314,7 +312,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 
 	@command(canBeMovedHelper)
 	spamCommand() {
-		getApp().deleteMessagesFromFolder(
+		rl.app.deleteMessagesFromFolder(
 			FolderType.Spam,
 			FolderStore.currentFolderFullNameRaw(),
 			MessageStore.messageListCheckedOrSelectedUidsWithSubMails(),
@@ -324,7 +322,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 
 	@command(canBeMovedHelper)
 	notSpamCommand() {
-		getApp().deleteMessagesFromFolder(
+		rl.app.deleteMessagesFromFolder(
 			FolderType.NotSpam,
 			FolderStore.currentFolderFullNameRaw(),
 			MessageStore.messageListCheckedOrSelectedUidsWithSubMails(),
@@ -470,7 +468,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 	 */
 	moveSelectedMessagesToFolder(sToFolderFullNameRaw, bCopy) {
 		if (this.canBeMoved()) {
-			getApp().moveMessagesToFolder(
+			rl.app.moveMessagesToFolder(
 				FolderStore.currentFolderFullNameRaw(),
 				MessageStore.messageListCheckedOrSelectedUidsWithSubMails(),
 				sToFolderFullNameRaw,
@@ -514,7 +512,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 	 * @returns {void}
 	 */
 	setAction(sFolderFullNameRaw, iSetAction, aMessages) {
-		getApp().messageListAction(sFolderFullNameRaw, iSetAction, aMessages);
+		rl.app.messageListAction(sFolderFullNameRaw, iSetAction, aMessages);
 	}
 
 	/**
@@ -586,7 +584,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 					// no default
 				}
 
-				getApp().reloadFlagsCurrentMessageListAndMessageFromCache();
+				rl.app.reloadFlagsCurrentMessageListAndMessageFromCache();
 			}
 		}
 	}
@@ -975,7 +973,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 
 				return false;
 			})
-			.on('onComplete', () => getApp().reloadMessageList(true, true));
+			.on('onComplete', () => rl.app.reloadMessageList(true, true));
 
 		return !!oJua;
 	}

dev/View/User/MailBox/MessageView.js

@@ -40,8 +40,6 @@ import * as Local from 'Storage/Client';
 
 import Remote from 'Remote/User/Fetch';
 
-import { getApp } from 'Helper/Apps/User';
-
 import { view, command, ViewType, showScreenPopup, createCommand } from 'Knoin/Knoin';
 import { AbstractViewNext } from 'Knoin/AbstractViewNext';
 
@@ -69,7 +67,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
 				const message = this.message();
 				if (message && this.allowMessageListActions) {
 					this.message(null);
-					getApp().deleteMessagesFromFolder(folderType, message.folderFullNameRaw, [message.uid], useFolder);
+					rl.app.deleteMessagesFromFolder(folderType, message.folderFullNameRaw, [message.uid], useFolder);
 				}
 			}, this.messageVisibility);
 
@@ -510,13 +508,13 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
 			el = eqs(event, '.attachmentsPlace .attachmentItem .attachmentNameParent');
 			if (el) {
 				const attachment = ko.dataFor(el);
-				attachment && attachment.download && getApp().download(attachment.linkDownload());
+				attachment && attachment.download && rl.app.download(attachment.linkDownload());
 			}
 
 			if (eqs(event, '.messageItemHeader .subjectParent .flagParent')) {
 				// eslint-disable-line prefer-arrow-callback
 				const message = this.message();
-				message && getApp().messageListAction(
+				message && rl.app.messageListAction(
 					message.folderFullNameRaw,
 					message.flagged() ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag,
 					[message]
@@ -527,7 +525,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
 			if (el) {
 				// eslint-disable-line prefer-arrow-callback
 				const message = ko.dataFor(el); // eslint-disable-line no-invalid-this
-				message && message.folder && message.uid &&  getApp().messageListAction(
+				message && message.folder && message.uid &&  rl.app.messageListAction(
 					message.folder,
 					message.flagged() ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag,
 					[message]
@@ -783,7 +781,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
 			Remote.attachmentsActions('Zip', hashes, this.downloadAsZipLoading)
 				.then((result) => {
 					if (result && result.Result && result.Result.Files && result.Result.Files[0] && result.Result.Files[0].Hash) {
-						getApp().download(attachmentDownload(result.Result.Files[0].Hash));
+						rl.app.download(attachmentDownload(result.Result.Files[0].Hash));
 					} else {
 						this.downloadAsZipError(true);
 					}
@@ -833,7 +831,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
 
 			storeMessageFlagsToCache(oMessage);
 
-			getApp().reloadFlagsCurrentMessageListAndMessageFromCache();
+			rl.app.reloadFlagsCurrentMessageListAndMessageFromCache();
 		}
 	}
 }