CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-04 04:06:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1154 from canihavesomecoffee/fix-owncloud-deserialization-issue

Browse source 
fixes Newtonsoft.Json.JsonSerializationException with OwnCloud upload
This commit is contained in:
Jaex 2015-11-28 07:42:05 +02:00
commit 22b29e51f0
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ShareX.UploadersLib/FileUploaders/OwnCloud.cs
View file

@ -24,6 +24,7 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using ShareX.HelpersLib;
using System;
using System.Collections.Generic;
@ -133,7 +134,8 @@ public string ShareFile(string path)
{
if (result.ocs.data != null && result.ocs.meta.statuscode == 100)
{
string link = result.ocs.data.url;
OwnCloudShareResponseData data = ((JObject)result.ocs.data).ToObject<OwnCloudShareResponseData>();
string link = data.url;
if (DirectLink) link += (IsCompatibility81 ? "/download" : "&download");
return link;
}
@ -155,7 +157,7 @@ public class OwnCloudShareResponse
public class OwnCloudShareResponseOcs
{
public OwnCloudShareResponseMeta meta { get; set; }
public OwnCloudShareResponseData data { get; set; }
public object data { get; set; }
}
public class OwnCloudShareResponseMeta