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:
authorChristian Kamm <mail@ckamm.de>2017-05-18 13:41:28 +0300
committerMarkus Goetz <markus@woboq.com>2017-05-22 11:54:30 +0300
commitf2b5fcd7060028e3fff4b3724ffaa2ba254421c4 (patch)
treed4e86d15af2b17f7472efe0d2a5fb788a6ad9650 /src/gui/sharemanager.cpp
parent950439e5b898621cc633dab7a75b595f97ce7b44 (diff)
Share link: Fix parsing integer ids #5777
Older ownCloud servers like 8.2.0 used to use integer ids. This broke when switching to QJson because toString() on JSON values is strict and returns "" for integers.
Diffstat (limited to 'src/gui/sharemanager.cpp')
-rw-r--r--src/gui/sharemanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp
index cc8233289..10d13a067 100644
--- a/src/gui/sharemanager.cpp
+++ b/src/gui/sharemanager.cpp
@@ -395,7 +395,7 @@ QSharedPointer<LinkShare> ShareManager::parseLinkShare(const QJsonObject &data)
}
return QSharedPointer<LinkShare>(new LinkShare(_account,
- data.value("id").toString(),
+ data.value("id").toVariant().toString(), // "id" used to be an integer, support both
data.value("path").toString(),
data.value("name").toString(),
data.value("token").toString(),
@@ -412,7 +412,7 @@ QSharedPointer<Share> ShareManager::parseShare(const QJsonObject &data)
(Sharee::Type)data.value("share_type").toInt()));
return QSharedPointer<Share>(new Share(_account,
- data.value("id").toString(),
+ data.value("id").toVariant().toString(), // "id" used to be an integer, support both
data.value("path").toString(),
(Share::ShareType)data.value("share_type").toInt(),
(Share::Permissions)data.value("permissions").toInt(),