Skip to content

[stable31] fix(federation): Allow federation file sharing when federation app is… - #52425

Merged
AndyScherzinger merged 1 commit into
stable31from
backport/52404/stable31
Apr 25, 2025
Merged

[stable31] fix(federation): Allow federation file sharing when federation app is…#52425
AndyScherzinger merged 1 commit into
stable31from
backport/52404/stable31

Conversation

@backportbot

Copy link
Copy Markdown

Backport of PR #52404

… disabled
The app id might be misleading, the federation app is for syncing addressbooks
with trusted servers. It is not always enabled and show not have to be.
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
nickvergessenforce-pushed the backport/52404/stable31 branch from b6729aa to 655d0fcCompareApril 25, 2025 07:49
@nickvergessen

Copy link
Copy Markdown
Member

Adjusted the backport with:

diff --git a/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php b/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
index 4d881e53b13..3c669a226b4 100644
--- a/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php+++ b/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php@@ -156,7 +156,7 @@ class CloudFederationProviderFiles implements ISignedCloudFederationProvider {
$ownerDisplayName = $this->getUserDisplayName($ownerFederatedId);
$trustedServers = null;
- if ($this->appManager->isEnabledForAnyone('federation')+ if ($this->appManager->isInstalled('federation')
&& class_exists(TrustedServers::class)) {
try {
$trustedServers = Server::get(TrustedServers::class);

@AndyScherzinger
AndyScherzinger merged commit 2d39bfa into stable31Apr 25, 2025
@AndyScherzinger
AndyScherzinger deleted the backport/52404/stable31 branch April 25, 2025 08:15
@blizzzblizzz mentioned this pull request May 5, 2025
10 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@nickvergessen@AndyScherzinger