mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 21:46:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3470 from rullzer/use_ocs_url

Browse source 
If the OCS Share API returns an url use that
This commit is contained in:
Klaas Freitag 2015-07-28 14:26:23 +02:00
commit b07ab14c31
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gui/sharedialog.cpp
View file

@ -335,8 +335,11 @@ void ShareDialog::slotSharesFetched(const QVariantMap &reply)
} }
QString url; QString url;
// From ownCloud server version 8 on, a different share link scheme is used. // From ownCloud server 8.2 the url field is always set for public shares
if (versionString.contains('.') && versionString.split('.')[0].toInt() >= 8) { if (data.contains("url")) {
url = data.value("url").toString();
} else if (versionString.contains('.') && versionString.split('.')[0].toInt() >= 8) {
// From ownCloud server version 8 on, a different share link scheme is used.
url = Account::concatUrlPath(_account->url(), QString("index.php/s/%1").arg(data.value("token").toString())).toString(); url = Account::concatUrlPath(_account->url(), QString("index.php/s/%1").arg(data.value("token").toString())).toString();
} else { } else {
QList<QPair<QString, QString>> queryArgs; QList<QPair<QString, QString>> queryArgs;