From: Christian Kamm <mail@ckamm.de>
Date: Thu, 18 May 2017 10:41:28 +0000 (+0200)
Subject: Share link: Fix parsing integer ids #5777
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~716
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f2b5fcd7060028e3fff4b3724ffaa2ba254421c4;p=nextcloud-desktop.git

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.
---

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(),