move files sidebar navigation manager into it's own service

Signed-off-by: Robin Appelman <[email protected]>

apps/files/composer/composer/autoload_classmap.php

@@ -53,4 +53,5 @@
     'OCA\\Files\\Service\\OwnershipTransferService' => $baseDir . '/../lib/Service/OwnershipTransferService.php',
     'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
     'OCA\\Files\\Settings\\PersonalSettings' => $baseDir . '/../lib/Settings/PersonalSettings.php',
+    'OCA\\Files\\SidebarNavigationManager' => $baseDir . '/../lib/SidebarNavigationManager.php',
 );

apps/files/composer/composer/autoload_static.php

@@ -68,6 +68,7 @@ class ComposerStaticInitFiles
         'OCA\\Files\\Service\\OwnershipTransferService' => __DIR__ . '/..' . '/../lib/Service/OwnershipTransferService.php',
         'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
         'OCA\\Files\\Settings\\PersonalSettings' => __DIR__ . '/..' . '/../lib/Settings/PersonalSettings.php',
+        'OCA\\Files\\SidebarNavigationManager' => __DIR__ . '/..' . '/../lib/SidebarNavigationManager.php',
     );
 
     public static function getInitializer(ClassLoader $loader)

apps/files/lib/App.php

@@ -25,31 +25,16 @@
 
 namespace OCA\Files;
 
-class App {
-	/**
-	 * @var \OCP\INavigationManager
-	 */
-	private static $navigationManager;
+use OCP\INavigationManager;
 
+class App {
 	/**
 	 * Returns the app's navigation manager
 	 *
-	 * @return \OCP\INavigationManager
+	 * @return INavigationManager
 	 */
-	public static function getNavigationManager() {
-		// TODO: move this into a service in the Application class
-		if (self::$navigationManager === null) {
-			self::$navigationManager = new \OC\NavigationManager(
-				\OC::$server->getAppManager(),
-				\OC::$server->getURLGenerator(),
-				\OC::$server->getL10NFactory(),
-				\OC::$server->getUserSession(),
-				\OC::$server->getGroupManager(),
-				\OC::$server->getConfig()
-			);
-			self::$navigationManager->clear(false);
-		}
-		return self::$navigationManager;
+	public static function getNavigationManager(): INavigationManager {
+		return \OC::$server->get(SidebarNavigationManager::class);
 	}
 
 	public static function extendJsConfig($settings) {

apps/files/lib/SidebarNavigationManager.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2021 Robin Appelman <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files;
+
+use OC\NavigationManager;
+
+class SidebarNavigationManager extends NavigationManager {
+	protected function init() {
+		// don't load the normal navigation items
+	}
+}

lib/private/NavigationManager.php

@@ -177,7 +177,7 @@ public function getActiveEntry() {
 		return $this->activeEntry;
 	}
 
-	private function init() {
+	protected function init() {
 		if ($this->init) {
 			return;
 		}