7.0 form fname

Author: 刘斌

library/src/androidTest/java/com/qiniu/android/FormUploadTest.java

@@ -267,6 +267,8 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
 
         Assert.assertEquals(info.toString(), expectKey, key);
         Assert.assertTrue(info.toString(), info.isOK());
+        //上传策略含空格 \"fname\":\" $(fname) \"
+        Assert.assertEquals(f.getName(), resp.optString("fname", "res doesn't include the FNAME").trim());
         Assert.assertNotNull(info.reqId);
         Assert.assertNotNull(resp);
         TempFile.remove(f);

library/src/androidTest/java/com/qiniu/android/TempFile.java

@@ -16,7 +16,7 @@ public static File createFile(int kiloSize) throws IOException {
         FileOutputStream fos = null;
         try {
             long size = (long) (1024 * kiloSize);
-            File f = File.createTempFile("qiniu_" + kiloSize + "k", "tmp");
+            File f = File.createTempFile("qiniu_" + kiloSize + "k", ".tmp");
             f.createNewFile();
             fos = new FileOutputStream(f);
             byte[] b = getByte(1024 * 4);

library/src/main/java/com/qiniu/android/http/HttpManager.java

@@ -152,7 +152,7 @@ public void multipartPost(URI uri, PostArgs args, ProgressHandler progressHandle
             }
         } else {
             try {
-                mbuilder.addPart("file", args.file, args.mimeType, "filename");
+                mbuilder.addPart("file", args.file, args.mimeType, args.fileName);
             } catch (IOException e) {
                 completionHandler.complete(ResponseInfo.fileError(e), null);
                 return;

library/src/main/java/com/qiniu/android/storage/FormUploader.java

@@ -66,6 +66,11 @@ private static void post(byte[] data, File file, String k, final UpToken token,
             args.fileName = "?";
         }
 
+        // data is null , or file is null
+        if (file != null) {
+            args.fileName = file.getName();
+        }
+
         params.put("token", token.token);
 
         final UploadOptions options = optionsIn != null ? optionsIn : UploadOptions.defaultOptions();