mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5472 from nextcloud/work/fix-infinite-loading-share-dialog-disabled-share-links

Browse Source 
Fix infinite loading in the share dialog when public link shares are disabled on the server
This commit is contained in:
Claudio Cambra 2023-03-01 20:44:44 +01:00 committed by GitHub
commit 33e1a900ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/filedetails/sharemodel.cpp
View File

@ -298,10 +298,7 @@ void ShareModel::initShareManager()
}
bool sharingPossible = true;
if (!publicLinkSharesEnabled()) {
qCWarning(lcSharing) << "Link shares have been disabled";
sharingPossible = false;
} else if (!canShare()) {
if (!canShare()) {
qCWarning(lcSharing) << "The file cannot be shared because it does not have sharing permission.";
sharingPossible = false;
}
@ -345,9 +342,11 @@ void ShareModel::handlePlaceholderLinkShare()
if (linkSharePresent && placeholderLinkSharePresent) {
slotRemoveShareWithId(placeholderLinkShareId);
} else if (!linkSharePresent && !placeholderLinkSharePresent) {
} else if (!linkSharePresent && !placeholderLinkSharePresent && publicLinkSharesEnabled()) {
slotAddShare(_placeholderLinkShare);
}
Q_EMIT sharesChanged();
}
void ShareModel::slotPropfindReceived(const QVariantMap &result)
@ -481,7 +480,6 @@ void ShareModel::slotAddShare(const SharePtr &share)
}
handlePlaceholderLinkShare();
Q_EMIT sharesChanged();
}
void ShareModel::slotRemoveShareWithId(const QString &shareId)
@ -508,8 +506,6 @@ void ShareModel::slotRemoveShareWithId(const QString &shareId)
endRemoveRows();
handlePlaceholderLinkShare();
Q_EMIT sharesChanged();
}
void ShareModel::slotServerError(const int code, const QString &message)