From b954c2f1860aac2542df0c284e6ecfc68b6e3608 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 14 Feb 2017 17:13:09 -0600
Subject: [PATCH] Fix app name of files app

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 apps/files/lib/AppInfo/Application.php             | 1 -
 apps/files/lib/Controller/ViewController.php       | 6 ------
 apps/files/tests/Controller/ViewControllerTest.php | 6 ------
 3 files changed, 13 deletions(-)

diff --git a/apps/files/lib/AppInfo/Application.php b/apps/files/lib/AppInfo/Application.php
index 4e5ec03eec..43c977655c 100644
--- a/apps/files/lib/AppInfo/Application.php
+++ b/apps/files/lib/AppInfo/Application.php
@@ -57,7 +57,6 @@ class Application extends App {
 				$c->query('AppName'),
 				$c->query('Request'),
 				$server->getURLGenerator(),
-				$server->getNavigationManager(),
 				$c->query('L10N'),
 				$server->getConfig(),
 				$server->getEventDispatcher(),
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 6f74fec861..788840ff1c 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -55,8 +55,6 @@ class ViewController extends Controller {
 	protected $request;
 	/** @var IURLGenerator */
 	protected $urlGenerator;
-	/** @var INavigationManager */
-	protected $navigationManager;
 	/** @var IL10N */
 	protected $l10n;
 	/** @var IConfig */
@@ -74,7 +72,6 @@ class ViewController extends Controller {
 	 * @param string $appName
 	 * @param IRequest $request
 	 * @param IURLGenerator $urlGenerator
-	 * @param INavigationManager $navigationManager
 	 * @param IL10N $l10n
 	 * @param IConfig $config
 	 * @param EventDispatcherInterface $eventDispatcherInterface
@@ -85,7 +82,6 @@ class ViewController extends Controller {
 	public function __construct($appName,
 								IRequest $request,
 								IURLGenerator $urlGenerator,
-								INavigationManager $navigationManager,
 								IL10N $l10n,
 								IConfig $config,
 								EventDispatcherInterface $eventDispatcherInterface,
@@ -97,7 +93,6 @@ class ViewController extends Controller {
 		$this->appName = $appName;
 		$this->request = $request;
 		$this->urlGenerator = $urlGenerator;
-		$this->navigationManager = $navigationManager;
 		$this->l10n = $l10n;
 		$this->config = $config;
 		$this->eventDispatcher = $eventDispatcherInterface;
@@ -244,7 +239,6 @@ class ViewController extends Controller {
 		$params['fileNotFound'] = $fileNotFound ? 1 : 0;
 		$params['appNavigation'] = $nav;
 		$params['appContents'] = $contentItems;
-		$this->navigationManager->setActiveEntry('files_index');
 
 		$response = new TemplateResponse(
 			$this->appName,
diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index 25445567ea..1d8c295655 100644
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -33,8 +33,6 @@ use OCP\Template;
 use Test\TestCase;
 use OCP\IRequest;
 use OCP\IURLGenerator;
-use OCP\AppFramework\Http\RedirectResponse;
-use OCP\INavigationManager;
 use OCP\IL10N;
 use OCP\IConfig;
 use OCP\IUserSession;
@@ -51,8 +49,6 @@ class ViewControllerTest extends TestCase {
 	private $request;
 	/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
 	private $urlGenerator;
-	/** @var INavigationManager */
-	private $navigationManager;
 	/** @var IL10N */
 	private $l10n;
 	/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
@@ -74,7 +70,6 @@ class ViewControllerTest extends TestCase {
 		parent::setUp();
 		$this->request = $this->getMockBuilder('\OCP\IRequest')->getMock();
 		$this->urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')->getMock();
-		$this->navigationManager = $this->getMockBuilder('\OCP\INavigationManager')->getMock();
 		$this->l10n = $this->getMockBuilder('\OCP\IL10N')->getMock();
 		$this->config = $this->getMockBuilder('\OCP\IConfig')->getMock();
 		$this->eventDispatcher = $this->getMockBuilder('\Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
@@ -93,7 +88,6 @@ class ViewControllerTest extends TestCase {
 			'files',
 			$this->request,
 			$this->urlGenerator,
-			$this->navigationManager,
 			$this->l10n,
 			$this->config,
 			$this->eventDispatcher,