Remove the icon for now

6 files changed, 0 insertions, 141 deletions

diff --git a/lib/private/notification/action.php b/lib/private/notification/action.php
index e1171531716..958b085b38e 100644
--- a/lib/private/notification/action.php
+++ b/lib/private/notification/action.php
@@ -154,28 +154,6 @@ class Action implements IAction {
 	}
 
 	/**
-	 * @param string $icon
-	 * @return $this
-	 * @throws \InvalidArgumentException if the icon is invalid
-	 * @since 8.2.0
-	 */
-	public function setIcon($icon) {
-		if (!is_string($icon) || $icon === '' || isset($icon[64])) {
-			throw new \InvalidArgumentException('The given icon is invalid');
-		}
-		$this->icon = $icon;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getIcon() {
-		return $this->icon;
-	}
-
-	/**
 	 * @return bool
 	 */
 	public function isValid() {
diff --git a/lib/private/notification/iaction.php b/lib/private/notification/iaction.php
index 9fd964e3dcf..4aed2e92517 100644
--- a/lib/private/notification/iaction.php
+++ b/lib/private/notification/iaction.php
@@ -95,20 +95,6 @@ interface IAction {
 	public function getRequestType();
 
 	/**
-	 * @param string $icon
-	 * @return $this
-	 * @throws \InvalidArgumentException if the icon is invalid
-	 * @since 8.2.0
-	 */
-	public function setIcon($icon);
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getIcon();
-
-	/**
 	 * @return bool
 	 * @since 8.2.0
 	 */
diff --git a/lib/private/notification/inotification.php b/lib/private/notification/inotification.php
index faf5db1d24c..a8bf5b110ab 100644
--- a/lib/private/notification/inotification.php
+++ b/lib/private/notification/inotification.php
@@ -180,20 +180,6 @@ interface INotification {
 	public function getLink();
 
 	/**
-	 * @param string $icon
-	 * @return $this
-	 * @throws \InvalidArgumentException if the icon are invalid
-	 * @since 8.2.0
-	 */
-	public function setIcon($icon);
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getIcon();
-
-	/**
 	 * @return IAction
 	 * @since 8.2.0
 	 */
diff --git a/lib/private/notification/notification.php b/lib/private/notification/notification.php
index 15ca0fee5d2..01df659d4a1 100644
--- a/lib/private/notification/notification.php
+++ b/lib/private/notification/notification.php
@@ -336,28 +336,6 @@ class Notification implements INotification {
 	}
 
 	/**
-	 * @param string $icon
-	 * @return $this
-	 * @throws \InvalidArgumentException if the icon are invalid
-	 * @since 8.2.0
-	 */
-	public function setIcon($icon) {
-		if (!is_string($icon) || $icon === '' || isset($icon[64])) {
-			throw new \InvalidArgumentException('The given icon is invalid');
-		}
-		$this->icon = $icon;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getIcon() {
-		return $this->icon;
-	}
-
-	/**
 	 * @return IAction
 	 * @since 8.2.0
 	 */
diff --git a/tests/lib/notification/actiontest.php b/tests/lib/notification/actiontest.php
index e319c250cc7..a6157d6c56e 100644
--- a/tests/lib/notification/actiontest.php
+++ b/tests/lib/notification/actiontest.php
@@ -171,47 +171,6 @@ class ActionTest extends TestCase {
 		$this->action->setLink($link, $type);
 	}
 
-	public function dataSetIcon() {
-		return [
-			['test1'],
-			[str_repeat('a', 1)],
-			[str_repeat('a', 64)],
-		];
-	}
-
-	/**
-	 * @dataProvider dataSetIcon
-	 * @param string $icon
-	 */
-	public function testSetIcon($icon) {
-		$this->assertSame('', $this->action->getIcon());
-		$this->action->setIcon($icon);
-		$this->assertSame($icon, $this->action->getIcon());
-	}
-
-	public function dataSetIconInvalid() {
-		return [
-			[true],
-			[false],
-			[0],
-			[1],
-			[''],
-			[str_repeat('a', 65)],
-			[[]],
-			[[str_repeat('a', 65)]],
-		];
-	}
-
-	/**
-	 * @dataProvider dataSetIconInvalid
-	 * @param string $icon
-	 *
-	 * @expectedException \InvalidArgumentException
-	 */
-	public function testSetIconInvalid($icon) {
-		$this->action->setIcon($icon);
-	}
-
 	public function testIsValid() {
 		$this->assertFalse($this->action->isValid());
 		$this->assertFalse($this->action->isValidParsed());
diff --git a/tests/lib/notification/notificationtest.php b/tests/lib/notification/notificationtest.php
index 98dc0e5bacd..8be49ebdc17 100644
--- a/tests/lib/notification/notificationtest.php
+++ b/tests/lib/notification/notificationtest.php
@@ -371,34 +371,6 @@ class NotificationTest extends TestCase {
 		$this->notification->setLink($link);
 	}
 
-	public function dataSetIcon() {
-		return $this->dataValidString(64);
-	}
-
-	/**
-	 * @dataProvider dataSetIcon
-	 * @param string $icon
-	 */
-	public function testSetIcon($icon) {
-		$this->assertSame('', $this->notification->getIcon());
-		$this->notification->setIcon($icon);
-		$this->assertSame($icon, $this->notification->getIcon());
-	}
-
-	public function dataSetIconInvalid() {
-		return $this->dataInvalidString(64);
-	}
-
-	/**
-	 * @dataProvider dataSetIconInvalid
-	 * @param mixed $icon
-	 *
-	 * @expectedException \InvalidArgumentException
-	 */
-	public function testSetIconInvalid($icon) {
-		$this->notification->setIcon($icon);
-	}
-
 	public function testCreateAction() {
 		$action = $this->notification->createAction();
 		$this->assertInstanceOf('OC\Notification\IAction', $action);