From 10143cf48fa608a9d47d6e000d976f4ac4c0c57f Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Fri, 17 Sep 2021 14:25:52 +0200
Subject: [PATCH] Remove useless "disable reload" feature

---
 dev/Common/Enums.js                                 |  1 -
 dev/View/User/MailBox/MessageList.js                | 13 +++++--------
 .../v/0.0.0/app/libraries/RainLoop/Actions.php      |  4 ----
 .../app/libraries/RainLoop/Config/Application.php   |  1 -
 .../app/libraries/RainLoop/Enumerations/Capa.php    |  1 -
 .../app/templates/Views/User/MailMessageList.html   |  2 +-
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js
index e261c40c5..0f4aae25e 100644
--- a/dev/Common/Enums.js
+++ b/dev/Common/Enums.js
@@ -7,7 +7,6 @@ export const Capa = {
 	OpenPGP: 'OPEN_PGP',
 	Prefetch: 'PREFETCH',
 	Contacts: 'CONTACTS',
-	Reload: 'RELOAD',
 	Search: 'SEARCH',
 	SearchAdv: 'SEARCH_ADV',
 	MessageActions: 'MESSAGE_ACTIONS',
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 9c3189d31..2bace52dd 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -59,7 +59,6 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
 
 		this.newMoveToFolder = !!SettingsGet('NewMoveToFolder');
 
-		this.allowReload = Settings.capa(Capa.Reload);
 		this.allowSearch = Settings.capa(Capa.Search);
 		this.allowSearchAdv = Settings.capa(Capa.SearchAdv);
 		this.allowDangerousActions = Settings.capa(Capa.DangerousActions);
@@ -770,13 +769,11 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
 			return false;
 		});
 
-		if (Settings.capa(Capa.Reload)) {
-			// check mail
-			shortcuts.add('r', 'meta', [Scope.FolderList, Scope.MessageList, Scope.MessageView], () => {
-				this.reloadCommand();
-				return false;
-			});
-		}
+		// check mail
+		shortcuts.add('r', 'meta', [Scope.FolderList, Scope.MessageList, Scope.MessageView], () => {
+			this.reloadCommand();
+			return false;
+		});
 
 		// check all
 		shortcuts.add('a', 'meta', Scope.MessageList, () => {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index a8d6fd05e..401004f05 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1909,10 +1909,6 @@ class Actions
 			$aResult[] = Enumerations\Capa::DANGEROUS_ACTIONS;
 		}
 
-		if ($oConfig->Get('capa', 'reload', true)) {
-			$aResult[] = Enumerations\Capa::RELOAD;
-		}
-
 		if ($oConfig->Get('capa', 'quota', true)) {
 			$aResult[] = Enumerations\Capa::QUOTA;
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 6bb7b9e27..cab0261d0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -190,7 +190,6 @@ class Application extends \RainLoop\Config\AbstractConfig
 				'settings' => array(true),
 				'quota' => array(true),
 				'help' => array(true),
-				'reload' => array(true),
 				'search' => array(true),
 				'search_adv' => array(true),
 				'dangerous_actions' => array(true),
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
index 5338cf6df..d2afa2c96 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
@@ -13,7 +13,6 @@ class Capa
 	const ADDITIONAL_ACCOUNTS = 'ADDITIONAL_ACCOUNTS';
 	const IDENTITIES = 'IDENTITIES';
 	const CONTACTS = 'CONTACTS';
-	const RELOAD = 'RELOAD';
 	const SEARCH = 'SEARCH';
 	const SEARCH_ADV = 'SEARCH_ADV';
 	const SETTINGS = 'SETTINGS';
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index ca5d70ca1..d1baf7663 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -7,7 +7,7 @@
 			<a class="btn buttonCompose show-mobile" data-bind="click: composeClick, css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}, visible: mobileCheckedStateHide()" data-i18n="[title]FOLDER_LIST/BUTTON_NEW_MESSAGE">
 				<i class="icon-paper-plane"></i>
 			</a>
-			<a class="btn" data-bind="command: reloadCommand, visible: allowReload && mobileCheckedStateHide()" data-i18n="[title]MESSAGE_LIST/BUTTON_RELOAD">
+			<a class="btn" data-bind="command: reloadCommand, visible: mobileCheckedStateHide()" data-i18n="[title]MESSAGE_LIST/BUTTON_RELOAD">
 				<i class="icon-spinner not-animated"></i>
 			</a>
 			<!-- ko if: !newMoveToFolder -->