Remove unused code

4 files changed, 11 insertions, 15 deletions

diff --git a/lib/Activity.php b/lib/Activity.php
index ded2300b..6e59f0ee 100644
--- a/lib/Activity.php
+++ b/lib/Activity.php
@@ -241,7 +241,7 @@ class Activity implements \OCP\Activity\IExtension {
 				array(
 					'id' => 'passman',
 					'name' => (string) $l->t('Passwords'),
-					'url' => '',//FIXME: $this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
+					'url' => '',//FIXME: Currenlty we cannot link directly to links, so this needs to be fixed... this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
 				),
 			),
 		);
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index d2468d79..5a61d1a0 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -32,7 +32,6 @@ class Application extends App {
 	public function __construct () {
 		parent::__construct('passman');
 		$container = $this->getContainer();
-		$server = $container->getServer();
 		// Allow automatic DI for the View, until we migrated to Nodes API
 		$container->registerService(View::class, function() {
 			return new View('');
diff --git a/lib/Notifier.php b/lib/Notifier.php
index 0f63bd53..5d701360 100644
--- a/lib/Notifier.php
+++ b/lib/Notifier.php
@@ -60,7 +60,7 @@ class Notifier implements INotifier {
 					$notification->addParsedAction($action);
 				}
 				return $notification;
-				break;
+
 
 			case 'credential_shared':
 				$notification->setParsedSubject(
@@ -80,21 +80,18 @@ class Notifier implements INotifier {
 					$notification->addParsedAction($action);
 				}
 				return $notification;
-				break;
 
 			case 'credential_share_denied':
 				$notification->setParsedSubject(
 					(string) $l->t('%s has declined your share request for "%s".', $notification->getSubjectParameters())
 				);
 				return $notification;
-				break;
 
 			case 'credential_share_accepted':
 				$notification->setParsedSubject(
 					(string) $l->t('%s has accepted your share request for "%s".', $notification->getSubjectParameters())
 				);
 				return $notification;
-				break;
 			default:
 				// Unknown subject => Unknown notification => throw
 				throw new \InvalidArgumentException();
diff --git a/lib/Service/NotificationService.php b/lib/Service/NotificationService.php
index 063efb7c..b353fcf4 100644
--- a/lib/Service/NotificationService.php
+++ b/lib/Service/NotificationService.php
@@ -21,7 +21,7 @@ class NotificationService {
 
 	private $manager;
 
-	public function __construct(FileMapper $fileMapper) {
+	public function __construct() {
 		$this->manager = \OC::$server->getNotificationManager();
 	}
 
@@ -41,8 +41,8 @@ class NotificationService {
 		$notification->setApp('passman')
 			->setUser($credential->getUserId())
 			->setDateTime(new \DateTime())
-			->setObject('credential', $credential->getId()) // $type and $id
-			->setSubject('credential_expired', [$credential->getLabel()]) // $subject and $parameters
+			->setObject('credential', $credential->getId()) // Set notification type and id
+			->setSubject('credential_expired', [$credential->getLabel()]) // set subject and parameters
 			->setLink($link)
 			->addAction($declineAction)
 			->addAction($remindAction);
@@ -64,8 +64,8 @@ class NotificationService {
 		$notification->setApp('passman')
 			->setUser($data['target_user'])
 			->setDateTime(new \DateTime())
-			->setObject('passman_share_request', $data['req_id']) // $type and $id
-			->setSubject('credential_shared', [$data['from_user'], $data['credential_label']]) // $subject and $parameters
+			->setObject('passman_share_request', $data['req_id']) // type and id
+			->setSubject('credential_shared', [$data['from_user'], $data['credential_label']]) // subject and parameters
 			->setLink($link)
 			->addAction($declineAction);
 
@@ -78,8 +78,8 @@ class NotificationService {
 		$notification->setApp('passman')
 			->setUser($data['target_user'])
 			->setDateTime(new \DateTime())
-			->setObject('passman_share_request', $data['req_id']) // $type and $id
-			->setSubject('credential_share_denied', [$data['from_user'], $data['credential_label']]); // $subject and $parameters
+			->setObject('passman_share_request', $data['req_id']) // type and id
+			->setSubject('credential_share_denied', [$data['from_user'], $data['credential_label']]); // subject and parameters
 		$this->manager->notify($notification);
 	}
 
@@ -89,8 +89,8 @@ class NotificationService {
 		$notification->setApp('passman')
 			->setUser($data['target_user'])
 			->setDateTime(new \DateTime())
-			->setObject('passman_share_request', $data['req_id']) // $type and $id
-			->setSubject('credential_share_accepted', [$data['from_user'], $data['credential_label']]); // $subject and $parameters
+			->setObject('passman_share_request', $data['req_id']) // type and id
+			->setSubject('credential_share_accepted', [$data['from_user'], $data['credential_label']]); // subject and parameters
 		$this->manager->notify($notification);
 	}