From de20896a715541a7f922dc13aa8424ae4cb0cb67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 20 Apr 2020 18:52:13 +0200
Subject: [PATCH] Use absolute urls for activity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/Activity/DeckProvider.php            | 18 +++++++++---------
 tests/unit/Activity/DeckProviderTest.php |  5 +++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php
index eae010a42..35551acc9 100644
--- a/lib/Activity/DeckProvider.php
+++ b/lib/Activity/DeckProvider.php
@@ -179,30 +179,30 @@ class DeckProvider implements IProvider {
 	}
 
 	private function getIcon(IEvent $event) {
-		$event->setIcon($this->urlGenerator->imagePath('deck', 'deck-dark.svg'));
+		$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('deck', 'deck-dark.svg')));
 		if (strpos($event->getSubject(), '_update') !== false) {
-			$event->setIcon($this->urlGenerator->imagePath('files', 'change.svg'));
+			$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('files', 'change.svg')));
 		}
 		if (strpos($event->getSubject(), '_create') !== false) {
-			$event->setIcon($this->urlGenerator->imagePath('files', 'add-color.svg'));
+			$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('files', 'add-color.svg')));
 		}
 		if (strpos($event->getSubject(), '_delete') !== false) {
-			$event->setIcon($this->urlGenerator->imagePath('files', 'delete-color.svg'));
+			$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('files', 'delete-color.svg')));
 		}
 		if (strpos($event->getSubject(), 'archive') !== false) {
-			$event->setIcon($this->urlGenerator->imagePath('deck', 'archive.svg'));
+			$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('deck', 'archive.svg')));
 		}
 		if (strpos($event->getSubject(), '_restore') !== false) {
-			$event->setIcon($this->urlGenerator->imagePath('core', 'actions/history.svg'));
+			$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/history.svg')));
 		}
 		if (strpos($event->getSubject(), 'attachment_') !== false) {
-			$event->setIcon($this->urlGenerator->imagePath('core', 'places/files.svg'));
+			$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'places/files.svg')));
 		}
 		if (strpos($event->getSubject(), 'comment_') !== false) {
-			$event->setIcon($this->urlGenerator->imagePath('core', 'actions/comment.svg'));
+			$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/comment.svg')));
 		}
 		if (strpos($event->getSubject(), 'label_') !== false) {
-			$event->setIcon($this->urlGenerator->imagePath('core', 'actions/tag.svg'));
+			$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/tag.svg')));
 		}
 		return $event;
 	}
diff --git a/tests/unit/Activity/DeckProviderTest.php b/tests/unit/Activity/DeckProviderTest.php
index c6d344f07..eba15d09f 100644
--- a/tests/unit/Activity/DeckProviderTest.php
+++ b/tests/unit/Activity/DeckProviderTest.php
@@ -136,6 +136,11 @@ class DeckProviderTest extends TestCase {
 			->will($this->returnCallback(function($a, $i) {
 				return $a . '/' . $i;
 			}));
+		$this->urlGenerator->expects($this->any())
+			->method('getAbsoluteURL')
+			->will($this->returnCallback(function($url) {
+				return $url;
+			}));
 		$this->provider->parse('en_US', $event);
 		$this->assertEquals($app . '/' . $icon, $event->getIcon());
 	}