Lets use the server methods for caching

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

1 files changed, 3 insertions, 9 deletions

diff --git a/lib/Controller/MessagesController.php b/lib/Controller/MessagesController.php
index a6d1821d7..32a87956a 100755
--- a/lib/Controller/MessagesController.php
+++ b/lib/Controller/MessagesController.php
@@ -85,9 +85,6 @@ class MessagesController extends Controller {
 	/** @var IURLGenerator */
 	private $urlGenerator;
 
-	/** @var ITimeFactory */
-	private $timeFactory;
-
 	/**
 	 * @param string $appName
 	 * @param IRequest $request
@@ -98,7 +95,6 @@ class MessagesController extends Controller {
 	 * @param IL10N $l10n
 	 * @param IMimeTypeDetector $mimeTypeDetector
 	 * @param IURLGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
 	 */
 	public function __construct(string $appName,
 								IRequest $request,
@@ -110,8 +106,7 @@ class MessagesController extends Controller {
 								ILogger $logger,
 								IL10N $l10n,
 								IMimeTypeDetector $mimeTypeDetector,
-								IURLGenerator $urlGenerator,
-								ITimeFactory $timeFactory) {
+								IURLGenerator $urlGenerator) {
 		parent::__construct($appName, $request);
 
 		$this->accountService = $accountService;
@@ -123,7 +118,7 @@ class MessagesController extends Controller {
 		$this->l10n = $l10n;
 		$this->mimeTypeDetector = $mimeTypeDetector;
 		$this->urlGenerator = $urlGenerator;
-		$this->timeFactory = $timeFactory;
+		$this->mailManager = $mailManager;
 	}
 
 	/**
@@ -257,8 +252,7 @@ class MessagesController extends Controller {
 			$htmlResponse->setContentSecurityPolicy($policy);
 
 			// Enable caching
-			$htmlResponse->setCacheHeaders(60 * 60, $this->timeFactory);
-			$htmlResponse->addHeader('Pragma', 'cache');
+			$htmlResponse->cacheFor(60 * 60);
 
 			return $htmlResponse;
 		} catch (Exception $ex) {