Merge pull request silkimen#1 from Johny101/HttpUploadSequenceEdition

Johny101 · web-flow · commit a52e243e5f01 · 2018-02-16T13:09:54.000-05:00
Modify android HTTP upload sequence for uniformity with IOS
diff --git a/src/android/com/synconset/cordovahttp/CordovaHttpUpload.java b/src/android/com/synconset/cordovahttp/CordovaHttpUpload.java
@@ -54,8 +54,6 @@ public void run() {
             MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
             String mimeType = mimeTypeMap.getMimeTypeFromExtension(ext);
 
-            request.part(this.name, filename, mimeType, new File(uri));
-
             Set<?> set = (Set<?>)this.getParamsMap().entrySet();
             Iterator<?> i = set.iterator();
 
@@ -72,6 +70,8 @@ public void run() {
                     return;
                 }
             }
+          
+            request.part(this.name, filename, mimeType, new File(uri));
 
             this.returnResponseObject(request);
         } catch (URISyntaxException e) {

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,6 @@ public void run() {`
`54`	`54`	`MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();`
`55`	`55`	`String mimeType = mimeTypeMap.getMimeTypeFromExtension(ext);`
`56`	`56`
`57`		`- request.part(this.name, filename, mimeType, new File(uri));`
`58`		`-`
`59`	`57`	`Set<?> set = (Set<?>)this.getParamsMap().entrySet();`
`60`	`58`	`Iterator<?> i = set.iterator();`
`61`	`59`
`@@ -72,6 +70,8 @@ public void run() {`
`72`	`70`	`return;`
`73`	`71`	`}`
`74`	`72`	`}`
	`73`	`+`
	`74`	`+ request.part(this.name, filename, mimeType, new File(uri));`
`75`	`75`
`76`	`76`	`this.returnResponseObject(request);`
`77`	`77`	`} catch (URISyntaxException e) {`