add 'supported'-label to all supported apps, also if they are not downloaded yet

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

diff --git a/apps/settings/lib/Controller/AppSettingsController.php b/apps/settings/lib/Controller/AppSettingsController.php
index 78326c2e25a2fdfc94e702fc10d1fa4552f92e46..5ed25ec2e2a001d5213a2dad3759ffc4b3549852 100644 (file)
--- a/apps/settings/lib/Controller/AppSettingsController.php
+++ b/apps/settings/lib/Controller/AppSettingsController.php
@@ -204,6 +204,7 @@ class AppSettingsController extends Controller {
                }
 
                $apps = $this->getAppsForCategory('');
+               $supportedApps = $appClass->getSupportedApps();
                foreach ($apps as $app) {
                        $app['appstore'] = true;
                        if (!array_key_exists($app['id'], $this->allApps)) {
@@ -211,6 +212,10 @@ class AppSettingsController extends Controller {
                        } else {
                                $this->allApps[$app['id']] = array_merge($app, $this->allApps[$app['id']]);
                        }
+
+                       if (in_array($app['id'], $supportedApps)) {
+                               $this->allApps[$app['id']]['level'] = \OC_App::supportedApp;
+                       }
                }
 
                // add bundle information

diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php
index 811703570a2d38fce4cdfb274559cc6bd893c514..101523fcfe789fb2484b21a97a92c863e66693f3 100644 (file)
--- a/lib/private/legacy/OC_App.php
+++ b/lib/private/legacy/OC_App.php
@@ -773,6 +773,18 @@ class OC_App {
                return $apps;
        }
 
+       /**
+        * List all supported apps
+        *
+        * @return array
+        */
+       public function getSupportedApps(): array {
+               /** @var \OCP\Support\Subscription\IRegistry $subscriptionRegistry */
+               $subscriptionRegistry = \OC::$server->query(\OCP\Support\Subscription\IRegistry::class);
+               $supportedApps = $subscriptionRegistry->delegateGetSupportedApps();
+               return $supportedApps;
+       }
+
        /**
         * List all apps, this is used in apps.php
         *
@@ -787,9 +799,7 @@ class OC_App {
                $appList = [];
                $langCode = \OC::$server->getL10N('core')->getLanguageCode();
                $urlGenerator = \OC::$server->getURLGenerator();
-               /** @var \OCP\Support\Subscription\IRegistry $subscriptionRegistry */
-               $subscriptionRegistry = \OC::$server->query(\OCP\Support\Subscription\IRegistry::class);
-               $supportedApps = $subscriptionRegistry->delegateGetSupportedApps();
+               $supportedApps = $this->getSupportedApps();
 
                foreach ($installedApps as $app) {
                        if (array_search($app, $blacklist) === false) {