@@ -20,6 +20,7 @@ class FileToUpload implements Parcelable {
2020 private static final String NEW_LINE = "\r \n " ;
2121
2222 private final File file ;
23+ private final String fileName ;
2324 private final String paramName ;
2425 private final String contentType ;
2526
@@ -32,10 +33,16 @@ class FileToUpload implements Parcelable {
3233 */
3334 public FileToUpload (final String path ,
3435 final String parameterName ,
36+ final String fileName ,
3537 final String contentType ) {
3638 this .file = new File (path );
3739 this .paramName = parameterName ;
3840 this .contentType = contentType ;
41+ if (fileName == null || "" .equals (fileName )) {
42+ this .fileName = this .file .getName ();
43+ } else {
44+ this .fileName = fileName ;
45+ }
3946 }
4047
4148 public final InputStream getStream () throws FileNotFoundException {
@@ -44,7 +51,7 @@ public final InputStream getStream() throws FileNotFoundException {
4451
4552 public byte [] getMultipartHeader () throws UnsupportedEncodingException {
4653 String header = "Content-Disposition: form-data; name=\" "
47- + paramName + "\" ; filename=\" " + file . getName () + "\" "
54+ + paramName + "\" ; filename=\" " + fileName + "\" "
4855 + NEW_LINE + "Content-Type: " + contentType + NEW_LINE + NEW_LINE ;
4956 return header .getBytes ("UTF-8" );
5057 }
@@ -78,11 +85,13 @@ public void writeToParcel(Parcel parcel, int arg1) {
7885 parcel .writeString (file .getAbsolutePath ());
7986 parcel .writeString (paramName );
8087 parcel .writeString (contentType );
88+ parcel .writeString (fileName );
8189 }
8290
8391 private FileToUpload (Parcel in ) {
8492 file = new File (in .readString ());
8593 paramName = in .readString ();
8694 contentType = in .readString ();
95+ fileName = in .readString ();
8796 }
8897}
0 commit comments