From bbab1fc8544e42187d7a7575b1a25b613780f703 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Wed, 29 Jun 2016 19:49:06 +0300
Subject: [PATCH] Dropbox upload works now but unable to create public url
 because they don't supply uid anymore

---
 ShareX.UploadersLib/BaseUploaders/Uploader.cs |  1 +
 ShareX.UploadersLib/FileUploaders/Dropbox.cs  | 52 +++++++++++--------
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/ShareX.UploadersLib/BaseUploaders/Uploader.cs b/ShareX.UploadersLib/BaseUploaders/Uploader.cs
index 6dd3b5366..7cd813f83 100644
--- a/ShareX.UploadersLib/BaseUploaders/Uploader.cs
+++ b/ShareX.UploadersLib/BaseUploaders/Uploader.cs
@@ -43,6 +43,7 @@ public class Uploader
         public const string ContentTypeMultipartFormData = "multipart/form-data";
         public const string ContentTypeJSON = "application/json";
         public const string ContentTypeURLEncoded = "application/x-www-form-urlencoded";
+        public const string ContentTypeOctetStream = "application/octet-stream";
 
         public delegate void ProgressEventHandler(ProgressManager progress);
         public event ProgressEventHandler ProgressChanged;
diff --git a/ShareX.UploadersLib/FileUploaders/Dropbox.cs b/ShareX.UploadersLib/FileUploaders/Dropbox.cs
index 73d8f89b9..11a810a47 100644
--- a/ShareX.UploadersLib/FileUploaders/Dropbox.cs
+++ b/ShareX.UploadersLib/FileUploaders/Dropbox.cs
@@ -184,7 +184,10 @@ public bool DownloadFile(string path, Stream downloadStream)
             {
                 NameValueCollection headers = GetAuthHeaders();
                 path = URLHelpers.AddSlash(path, SlashType.Prefix);
-                string arg = JsonConvert.SerializeObject(new DropboxPath(path));
+                string arg = JsonConvert.SerializeObject(new
+                {
+                    path = path
+                });
                 headers.Add("Dropbox-API-Arg", arg);
 
                 return SendRequest(HttpMethod.POST, downloadStream, URLDownload, headers: headers, contentType: ContentTypeJSON);
@@ -195,30 +198,47 @@ public bool DownloadFile(string path, Stream downloadStream)
 
         public UploadResult UploadFile(Stream stream, string path, string fileName, bool createShareableURL = false, DropboxURLType urlType = DropboxURLType.Default)
         {
-            string url = URLHelpers.CombineURL(URLUpload, URLHelpers.URLPathEncode(path));
-
-            // There's a 150MB limit to all uploads through the API.
-            UploadResult result = UploadData(stream, url, fileName, headers: GetAuthHeaders());
-
-            if (result.IsSuccess)
+            if (stream.Length > 150000000)
             {
-                DropboxContentInfo content = JsonConvert.DeserializeObject<DropboxContentInfo>(result.Response);
+                Errors.Add("There's a 150MB limit to uploads through the API.");
+                return null;
+            }
+
+            NameValueCollection headers = GetAuthHeaders();
+            path = URLHelpers.AddSlash(path, SlashType.Prefix);
+            path = URLHelpers.CombineURL(path, fileName);
+            string arg = JsonConvert.SerializeObject(new
+            {
+                path = path,
+                mode = "overwrite",
+                autorename = false,
+                mute = true
+            });
+            headers.Add("Dropbox-API-Arg", arg);
+
+            string response = SendRequestStream(URLUpload, stream, ContentTypeOctetStream, headers);
+
+            UploadResult ur = new UploadResult(response);
+
+            if (!string.IsNullOrEmpty(ur.Response))
+            {
+                DropboxContentInfo content = JsonConvert.DeserializeObject<DropboxContentInfo>(ur.Response);
 
                 if (content != null)
                 {
                     if (createShareableURL)
                     {
                         AllowReportProgress = false;
-                        result.URL = CreateShareableLink(content.Path, urlType);
+                        ur.URL = CreateShareableLink(content.Path, urlType);
                     }
                     else
                     {
-                        result.URL = GetPublicURL(content.Path);
+                        ur.URL = GetPublicURL(content.Path);
                     }
                 }
             }
 
-            return result;
+            return ur;
         }
 
         public DropboxContentInfo GetMetadata(string path, bool list)
@@ -427,16 +447,6 @@ public static string TidyUploadPath(string uploadPath)
         }
     }
 
-    public class DropboxPath
-    {
-        public string path { get; set; }
-
-        public DropboxPath(string path)
-        {
-            this.path = path;
-        }
-    }
-
     public class DropboxAccount
     {
         public string account_id { get; set; }