Skip to content

Commit 2aa6894

Browse files
Merge pull request #54239 from nextcloud/cleanup-appframework-spreed
refactor(AppFramework): drop unused spreed/Talk fallback
2 parents c9fa1db + 9195987 commit 2aa6894

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

lib/private/AppFramework/App.php

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,8 @@ public static function buildAppNamespace(string $appId, string $topNamespace = '
5050
if (isset($appInfo['namespace'])) {
5151
self::$nameSpaceCache[$appId] = trim($appInfo['namespace']);
5252
} else {
53-
if ($appId !== 'spreed') {
54-
// if the tag is not found, fall back to uppercasing the first letter
55-
self::$nameSpaceCache[$appId] = ucfirst($appId);
56-
} else {
57-
// For the Talk app (appid spreed) the above fallback doesn't work.
58-
// This leads to a problem when trying to install it freshly,
59-
// because the apps namespace is already registered before the
60-
// app is downloaded from the appstore, because of the hackish
61-
// global route index.php/call/{token} which is registered via
62-
// the core/routes.php so it does not have the app namespace.
63-
// @ref https://github.com/nextcloud/server/pull/19433
64-
self::$nameSpaceCache[$appId] = 'Talk';
65-
}
53+
// if the tag is not found, fall back to uppercasing the first letter
54+
self::$nameSpaceCache[$appId] = ucfirst($appId);
6655
}
6756

6857
return $topNamespace . self::$nameSpaceCache[$appId];

0 commit comments

Comments
 (0)