Fix uploadLarge to use X-Unique-Upload-Id instead of updating params. Solves cloudinary/cloudinary_android#18

Author: tallevami-home

cloudinary-android/src/main/java/com/cloudinary/android/MultipartUtility.java

@@ -10,6 +10,7 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.Map;
 
 import com.cloudinary.Cloudinary;
 
@@ -40,15 +41,19 @@ public class MultipartUtility {
 	 * @param charset
 	 * @throws IOException
 	 */
-	public MultipartUtility(String requestURL, String charset, String boundary, String contentRange) throws IOException {
+	public MultipartUtility(String requestURL, String charset, String boundary, Map<String,String> headers) throws IOException {
 		this.charset = charset;
 		this.boundary = boundary;
 
 		URL url = new URL(requestURL);
 		httpConn = (HttpURLConnection) url.openConnection();
 		httpConn.setDoOutput(true); // indicates POST method
 		httpConn.setDoInput(true);
-		if (contentRange != null) httpConn.setRequestProperty("Content-Range", contentRange);
+		if (headers != null) {
+			for (Map.Entry<String,String> header : headers.entrySet()) {
+				httpConn.setRequestProperty(header.getKey(), header.getValue());
+			}
+		}
 		httpConn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
 		httpConn.setRequestProperty("User-Agent", USER_AGENT);
 		outputStream = httpConn.getOutputStream();

cloudinary-android/src/main/java/com/cloudinary/android/UploaderStrategy.java

@@ -47,7 +47,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 			}
 		}
 		String apiUrl = this.cloudinary().cloudinaryApiUrl(action, options);
-		MultipartUtility multipart = new MultipartUtility(apiUrl, "UTF-8", this.cloudinary().randomPublicId(), (String) options.get("content_range"));
+		MultipartUtility multipart = new MultipartUtility(apiUrl, "UTF-8", this.cloudinary().randomPublicId(), (Map<String,String>) options.get("extra_headers"));
 
 		// Remove blank parameters
 		for (Map.Entry<String, Object> param : params.entrySet()) {

cloudinary-core/src/main/java/com/cloudinary/Uploader.java

@@ -98,12 +98,12 @@ public Map uploadLarge(Object file, Map options, int bufferSize) throws IOExcept
 
 	private Map uploadLargeParts(InputStream input, Map options, int bufferSize, long length) throws IOException {
 		Map params = buildUploadParams(options);
-		Map nextParams = new HashMap();
-		nextParams.putAll(params);
-		Map sentParams = new HashMap();
 
 		Map sentOptions = new HashMap();
 		sentOptions.putAll(options);
+		Map extraHeaders = new HashMap();
+		extraHeaders.put("X-Unique-Upload-Id", cloudinary().randomPublicId());
+		sentOptions.put("extra_headers", extraHeaders);
 
 		byte[] buffer = new byte[bufferSize];
 		byte[] nibbleBuffer = new byte[1];
@@ -120,8 +120,6 @@ private Map uploadLargeParts(InputStream input, Map options, int bufferSize, lon
 
 			if (atEnd || fullBuffer) {
 				totalBytes += currentBufferSize;
-				sentParams.clear();
-				sentParams.putAll(nextParams);
 				int currentLoc = bufferSize * partNumber;
 				if (!atEnd) {
 					//verify not on end - try read another byte
@@ -135,10 +133,10 @@ private Map uploadLargeParts(InputStream input, Map options, int bufferSize, lon
 					buffer = finalBuffer;
 				}
 				String range = String.format("bytes %d-%d/%d", currentLoc, currentLoc + currentBufferSize - 1, length);  
-				sentOptions.put("content_range", range);
+				extraHeaders.put("Content-Range", range);
+				Map sentParams = new HashMap();
+				sentParams.putAll(params);
 				response = callApi("upload", sentParams, sentOptions, buffer);
-				nextParams.put("public_id", response.get("public_id"));
-				nextParams.put("upload_id", response.get("upload_id"));
 				if (atEnd) break;
 				buffer[0] = nibbleBuffer[0];
 				currentBufferSize = 1;

cloudinary-http42/src/main/java/com/cloudinary/http42/UploaderStrategy.java

@@ -60,8 +60,11 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 		HttpPost postMethod = new HttpPost(apiUrl);
 		postMethod.setHeader("User-Agent", Cloudinary.USER_AGENT + " ApacheHTTPComponents/4.2");
 
-		if (options.get("content_range") != null) {
-			postMethod.setHeader("Content-Range", (String) options.get("content_range")); 
+		Map<String,String> extraHeaders = (Map<String,String>) options.get("extra_headers");
+		if (extraHeaders != null) {
+			for (Map.Entry<String,String> header : extraHeaders.entrySet()) {
+				postMethod.setHeader(header.getKey(), header.getValue());
+			}
 		}
 
 		Charset utf8 = Charset.forName("UTF-8");

cloudinary-http43/src/main/java/com/cloudinary/http43/UploaderStrategy.java

@@ -71,8 +71,11 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 
 		HttpPost postMethod = new HttpPost(apiUrl);
 
-		if (options.get("content_range") != null) {
-			postMethod.setHeader("Content-Range", (String) options.get("content_range")); 
+		Map<String,String> extraHeaders = (Map<String,String>) options.get("extra_headers");
+		if (extraHeaders != null) {
+			for (Map.Entry<String,String> header : extraHeaders.entrySet()) {
+				postMethod.setHeader(header.getKey(), header.getValue());
+			}
 		}
 
 		MultipartEntityBuilder multipart = MultipartEntityBuilder.create();

cloudinary-http44/src/main/java/com/cloudinary/http44/UploaderStrategy.java

@@ -71,8 +71,11 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 
 		HttpPost postMethod = new HttpPost(apiUrl);
 
-		if (options.get("content_range") != null) {
-			postMethod.setHeader("Content-Range", (String) options.get("content_range")); 
+		Map<String,String> extraHeaders = (Map<String,String>) options.get("extra_headers");
+		if (extraHeaders != null) {
+			for (Map.Entry<String,String> header : extraHeaders.entrySet()) {
+				postMethod.setHeader(header.getKey(), header.getValue());
+			}
 		}
 
 		MultipartEntityBuilder multipart = MultipartEntityBuilder.create();