fixup! fixup! fix(NavigationManager): only resolve navigations of booted apps

Author: susnux

lib/private/NavigationManager.php

@@ -39,6 +39,7 @@ class NavigationManager implements INavigationManager {
 	private ?array $customAppOrder = null;
 	/** List of loaded app info */
 	private array $loadedAppInfo = [];
+	private bool $additionalEntriesLoaded = false;
 
 	public function __construct(
 		protected IAppManager $appManager,
@@ -206,30 +207,41 @@ private function init(): void {
 	 * Resolve the app navigation entries from closures and info.xml files.
 	 */
 	private function resolveAppNavigationEntries(): void {
-		// Resolve app navigation closures
-		while ($c = array_pop($this->closureEntries)) {
-			$this->add($c());
+		$this->resolveAppInfoEntries();
+
+		// we do not really know the current bootstrapping state
+		// but we know that the files app is always enabled and loaded when "filesystem" is loaded thus the server is ready or close-to-ready.
+		if ($this->appManager->isAppLoaded('files')) {
+			// Resolve app navigation closures
+			while ($c = array_pop($this->closureEntries)) {
+				$this->add($c());
+			}
+
+			// Resolve dynamically added navigation entries via event listeners
+			if (!$this->additionalEntriesLoaded) {
+				$this->eventDispatcher->dispatchTyped(new LoadAdditionalEntriesEvent());
+				$this->additionalEntriesLoaded = true;
+			}
 		}
+	}
 
-		// Resolve classic info.xml based navigation entries
+	/**
+	 * Resolve classic info.xml based navigation entires
+	 */
+	private function resolveAppInfoEntries(): bool {
 		if ($this->userSession->isLoggedIn()) {
 			$user = $this->userSession->getUser();
 			$apps = $this->appManager->getEnabledAppsForUser($user);
 		} else {
 			$apps = $this->appManager->getEnabledApps();
 		}
 
-		if (count($apps) === count($this->loadedAppInfo)) {
-			// All apps that are loaded for the user have already been resolved
-			return;
+		$appsToLoad = array_diff($this->loadedAppInfo, $apps);
+		if ($appsToLoad === []) {
+			return false;
 		}
 
-		foreach ($apps as $app) {
-			if (in_array($app, $this->loadedAppInfo)) {
-				// the apps navigations were already resolved
-				continue;
-			}
-
+		foreach ($appsToLoad as $app) {
 			// load plugins and collections from info.xml
 			$info = $this->appManager->getAppInfo($app);
 			if (!isset($info['navigations']['navigation'])) {
@@ -302,9 +314,7 @@ private function resolveAppNavigationEntries(): void {
 				));
 			}
 		}
-
-		// Resolve dynamically added navigation entries via event listeners
-		$this->eventDispatcher->dispatchTyped(new LoadAdditionalEntriesEvent());
+		return true;
 	}
 
 	private function isAdmin(): bool {