close #141

Author: jwfing

core/src/main/java/cn/leancloud/AVFile.java

@@ -488,8 +488,8 @@ public AVFile apply(AVObject avObject) throws Exception {
 
   private Observable<AVFile> saveWithProgressCallback(boolean keepFileName, final ProgressCallback callback) {
     JSONObject paramData = generateChangedParam();
-    final String fileKey = FileUtil.generateFileKey(this.getName(), keepFileName);
-    paramData.put("key", fileKey);
+//    final String fileKey = FileUtil.generateFileKey(this.getName(), keepFileName);
+//    paramData.put("key", fileKey);
     paramData.put("__type", "File");
     if (StringUtil.isEmpty(getObjectId())) {
       if (!StringUtil.isEmpty(getUrl())) {
@@ -505,7 +505,7 @@ public AVFile apply(@NonNull FileUploadToken fileUploadToken) throws Exception {
                   AVFile.this.internalPutDirectly(KEY_OBJECT_ID, fileUploadToken.getObjectId());
                   AVFile.this.internalPutDirectly(KEY_BUCKET, fileUploadToken.getBucket());
                   AVFile.this.internalPutDirectly(KEY_PROVIDER, fileUploadToken.getProvider());
-                  AVFile.this.internalPutDirectly(KEY_FILE_KEY, fileKey);
+                  AVFile.this.internalPutDirectly(KEY_FILE_KEY, fileUploadToken.getKey());
 
                   Uploader uploader = new FileUploader(AVFile.this, fileUploadToken, callback);
                   AVFile.this.internalPutDirectly(KEY_URL, fileUploadToken.getUrl());

core/src/main/java/cn/leancloud/gson/FileUploadTokenAdapter.java

@@ -17,6 +17,7 @@ public class FileUploadTokenAdapter extends TypeAdapter<FileUploadToken> {
   private static final String FIELD_PROVIDER = "provider";
   private static final String FIELD_TOKEN = "token";
   private static final String FIELD_URL = "url";
+  private static final String FIELD_KEY = "key";
 
   public void write(JsonWriter writer, FileUploadToken token) throws IOException {
     JsonObject jsonObject = new JsonObject();
@@ -26,6 +27,7 @@ public void write(JsonWriter writer, FileUploadToken token) throws IOException {
     jsonObject.addProperty(FIELD_PROVIDER, token.getProvider());
     jsonObject.addProperty(FIELD_TOKEN, token.getToken());
     jsonObject.addProperty(FIELD_URL, token.getUrl());
+    jsonObject.addProperty(FIELD_KEY, token.getKey());
     TypeAdapters.JSON_ELEMENT.write(writer, jsonObject);
   }
 
@@ -52,6 +54,9 @@ public FileUploadToken read(JsonReader reader) throws IOException {
       if (jsonObject.has(FIELD_URL)) {
         token.setUrl(jsonObject.get(FIELD_URL).getAsString());
       }
+      if (jsonObject.has(FIELD_KEY)) {
+        token.setKey(jsonObject.get(FIELD_KEY).getAsString());
+      }
       return token;
     }
     return null;

core/src/main/java/cn/leancloud/upload/FileUploadToken.java

@@ -15,6 +15,8 @@ public class FileUploadToken {
 
   private String url = null;
 
+  private String key = null;
+
   public FileUploadToken() {
   }
 
@@ -66,6 +68,14 @@ public void setUrl(String url) {
     this.url = url;
   }
 
+  public String getKey() {
+    return key;
+  }
+
+  public void setKey(String key) {
+    this.key = key;
+  }
+
   @java.lang.Override
   public java.lang.String toString() {
     return "FileUploadToken{" +
@@ -75,6 +85,7 @@ public java.lang.String toString() {
             ", provider='" + provider + '\'' +
             ", token='" + token + '\'' +
             ", url='" + url + '\'' +
+            ", key='" + key + '\'' +
             '}';
   }
 
@@ -88,11 +99,12 @@ public boolean equals(Object o) {
             AVUtils.equals(uploadUrl, that.uploadUrl) &&
             AVUtils.equals(provider, that.provider) &&
             AVUtils.equals(token, that.token) &&
-            AVUtils.equals(url, that.url);
+            AVUtils.equals(url, that.url) &&
+            AVUtils.equals(key, that.key);
   }
 
   @Override
   public int hashCode() {
-    return AVUtils.hash(bucket, objectId, uploadUrl, provider, token, url);
+    return AVUtils.hash(bucket, objectId, uploadUrl, provider, token, url, key);
   }
 }

core/src/main/java/cn/leancloud/utils/FileUtil.java

@@ -18,20 +18,20 @@ public static void config(MimeTypeDetector mimeTypeDetector) {
     detector = mimeTypeDetector;
   }
 
-  public static String generateFileKey(String name, boolean keepFilename) {
-    String key = StringUtil.getRandomString(DEFAULT_FILE_KEY_LEN);
-    int idx = 0;
-    if (!StringUtil.isEmpty(name)) {
-      idx = name.lastIndexOf(".");
-    }
-    if (keepFilename) {
-      key += "/" + name;
-    } else if (idx > 0) {
-      String postFix = name.substring(idx);
-      key += postFix;
-    }
-    return key;
-  }
+//  public static String generateFileKey(String name, boolean keepFilename) {
+//    String key = StringUtil.getRandomString(DEFAULT_FILE_KEY_LEN);
+//    int idx = 0;
+//    if (!StringUtil.isEmpty(name)) {
+//      idx = name.lastIndexOf(".");
+//    }
+//    if (keepFilename) {
+//      key += "/" + name;
+//    } else if (idx > 0) {
+//      String postFix = name.substring(idx);
+//      key += postFix;
+//    }
+//    return key;
+//  }
 
   public static String getExtensionFromFilename(String filename) {
     if (!StringUtil.isEmpty(filename) && Pattern.matches("[a-zA-Z_0-9\\.\\-\\(\\)\\%]+", filename)) {

core/src/test/java/cn/leancloud/upload/FileUploadTokenTest.java

@@ -21,6 +21,7 @@ public void testJSONObject() {
     token.setToken("tokenV");
     token.setUploadUrl("uploadUrlV");
     token.setUrl("http://upload.com/file");
+    token.setKey("dxStIHG3RcqvA6BK5DDJqQCsouDE1IgF/test.jpeg");
     String str = JSON.toJSONString(token);
     FileUploadToken token2 = JSON.parseObject(str, FileUploadToken.class);
     assert token.equals(token2);