diff --git a/android-networking/src/main/java/com/androidnetworking/common/ANRequest.java b/android-networking/src/main/java/com/androidnetworking/common/ANRequest.java index d85b1db8..d0732e49 100644 --- a/android-networking/src/main/java/com/androidnetworking/common/ANRequest.java +++ b/android-networking/src/main/java/com/androidnetworking/common/ANRequest.java @@ -867,7 +867,14 @@ public RequestBody getMultiPartRequestBody() { for (HashMap.Entry> entry : mMultiPartFileMap.entrySet()) { List fileBodies = entry.getValue(); for (MultipartFileBody fileBody : fileBodies) { - String fileName = fileBody.file.getName(); + + String fileName = ""; + if (fileBody.fileName == null || fileBody.fileName.trim().equals("")) { + fileName = fileBody.file.getName(); + }else{ + fileName = fileBody.fileName; + } + MediaType mediaType; if (fileBody.contentType != null) { mediaType = MediaType.parse(fileBody.contentType); @@ -1845,6 +1852,12 @@ public T addMultipartFile(Map multiPartFileMap, String contentType return (T) this; } + public T addMultipartFile(String key,String fileName, File file, String contentType) { + MultipartFileBody fileBody = new MultipartFileBody(file, contentType,fileName); + addMultipartFileWithKey(key, fileBody); + return (T) this; + } + public T addMultipartFileList(String key, List files) { return addMultipartFileList(key, files, null); } diff --git a/android-networking/src/main/java/com/androidnetworking/model/MultipartFileBody.java b/android-networking/src/main/java/com/androidnetworking/model/MultipartFileBody.java index 7da6c943..f3a9863f 100644 --- a/android-networking/src/main/java/com/androidnetworking/model/MultipartFileBody.java +++ b/android-networking/src/main/java/com/androidnetworking/model/MultipartFileBody.java @@ -6,10 +6,17 @@ public class MultipartFileBody { public final File file; public final String contentType; + public String fileName; public MultipartFileBody(File file, String contentType) { this.file = file; this.contentType = contentType; } + public MultipartFileBody(File file, String contentType, String fileName) { + this.file = file; + this.contentType = contentType; + this.fileName = fileName; + } + } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b3113037..d2c45a4b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Apr 12 21:48:48 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip