fix(apps-store): Remove apps from force-enabled state when uninstalled

If an app is force-enabled and then uninstalled the force-enabled state was kept. This is now removed, so when the app should be re-installed the compatibility should be reevaluated. Signed-off-by: Ferdinand Thiessen <[email protected]>
nextcloud · Oct 23, 2024 · cb45a3b · cb45a3b
1 parent 74cd6e2
commit cb45a3b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/apps/settings/lib/Controller/AppSettingsController.php b/apps/settings/lib/Controller/AppSettingsController.php
@@ -557,6 +557,8 @@ public function uninstallApp(string $appId): JSONResponse {
 		$appId = $this->appManager->cleanAppId($appId);
 		$result = $this->installer->removeApp($appId);
 		if ($result !== false) {
+			// If this app was force enabled, remove the force-enabled-state
+			$this->appManager->ignoreNextcloudRequirementForApp($appId, false);
 			$this->appManager->clearAppsCache();
 			return new JSONResponse(['data' => ['appid' => $appId]]);
 		}

diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
@@ -1035,6 +1035,7 @@
   <file src="apps/settings/lib/Controller/AppSettingsController.php">
     <UndefinedInterfaceMethod>
       <code><![CDATA[ignoreNextcloudRequirementForApp]]></code>
+      <code><![CDATA[ignoreNextcloudRequirementForApp]]></code>
     </UndefinedInterfaceMethod>
   </file>
   <file src="apps/settings/lib/Hooks.php">

diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
@@ -410,12 +410,14 @@ public function isInstalled($appId) {
 		return isset($installedApps[$appId]);
 	}
 
-	public function ignoreNextcloudRequirementForApp(string $appId): void {
+	public function ignoreNextcloudRequirementForApp(string $appId, bool $enabled = true): void {
 		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		if (!in_array($appId, $ignoreMaxApps, true)) {
+		if ($enabled && !in_array($appId, $ignoreMaxApps, true)) {
 			$ignoreMaxApps[] = $appId;
-			$this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
+		} elseif ($enabled === false) {
+			$ignoreMaxApps = array_filter($ignoreMaxApps, fn (string $id) => $id !== $appId);
 		}
+		$this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
 	}
 
 	public function loadApp(string $app): void {