Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannah von Reth <hannah.vonreth@owncloud.com>2022-06-30 16:30:18 +0300
committerHannah von Reth <vonreth@kde.org>2022-06-30 17:42:51 +0300
commitefa21135ad7fa35c8bb5623e906f784296b92035 (patch)
tree2848adea850e4b91749e88e68f466d1c9e0d0cbd /src/gui/socketapi
parent8472fd0e44fab168d5992e2c3d70ac90b6520809 (diff)
Don't query private links if disabled on the server
Fixes: #8998
Diffstat (limited to 'src/gui/socketapi')
-rw-r--r--src/gui/socketapi/socketapi.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp
index e638fbbc1..3321d8951 100644
--- a/src/gui/socketapi/socketapi.cpp
+++ b/src/gui/socketapi/socketapi.cpp
@@ -938,11 +938,9 @@ void SocketApi::sendSharingContextMenuOptions(const FileData &fileData, SocketLi
}
}
- listener->sendMessage(QStringLiteral("MENU_ITEM:COPY_PRIVATE_LINK") + flagString + tr("Copy private link to clipboard"));
-
- // Disabled: only providing email option for private links would look odd,
- // and the copy option is more general.
- //listener->sendMessage(QLatin1String("MENU_ITEM:EMAIL_PRIVATE_LINK") + flagString + tr("Send private link by email..."));
+ if (capabilities.privateLinkPropertyAvailable()) {
+ listener->sendMessage(QStringLiteral("MENU_ITEM:COPY_PRIVATE_LINK") + flagString + tr("Copy private link to clipboard"));
+ }
}
SocketApi::FileData SocketApi::FileData::get(const QString &localFile)
@@ -1022,10 +1020,12 @@ void SocketApi::command_GET_MENU_ITEMS(const QString &argument, OCC::SocketListe
if (fileData.folder && fileData.folder->accountState()->isConnected()) {
sendSharingContextMenuOptions(fileData, listener);
- listener->sendMessage(QLatin1String("MENU_ITEM:OPEN_PRIVATE_LINK") + flagString + tr("Open in browser"));
- // Add link to versions pane if possible
auto &capabilities = folder->accountState()->account()->capabilities();
+ if (capabilities.privateLinkPropertyAvailable()) {
+ listener->sendMessage(QLatin1String("MENU_ITEM:OPEN_PRIVATE_LINK") + flagString + tr("Open in browser"));
+ }
+ // Add link to versions pane if possible
if (capabilities.versioningEnabled()
&& capabilities.privateLinkDetailsParamAvailable()
&& isOnTheServer