Merge pull request #132 from longbai/fixfilehandleleak

fixed file handle leak when resume upload

Author: longbai

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

@@ -6,6 +6,7 @@ public interface CancellationHandler {
 
     /**
      * 定义用户取消数据或文件上传的信号
+     *
      * @return 是否已取消
      */
     boolean isCancelled();

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

@@ -36,12 +36,7 @@ private static String getUserAgent(String id) {
                 android.os.Build.VERSION.RELEASE, device(), id);
     }
 
-    public String toString() {
-        return ua;
-    }
-
-    private static String device()
-    {
+    private static String device() {
         String model = Build.MODEL.trim();
         String device = deviceName(Build.MANUFACTURER.trim(), model);
         if (TextUtils.isEmpty(device)) {
@@ -50,8 +45,7 @@ private static String device()
         return (device == null ? "" : device) + "-" + model;
     }
 
-    private static String deviceName(String manufacturer, String model)
-    {
+    private static String deviceName(String manufacturer, String model) {
         String str = manufacturer.toLowerCase();
         if ((str.startsWith("unknown")) || (str.startsWith("alps")) ||
                 (str.startsWith("android")) || (str.startsWith("sprd")) ||
@@ -64,4 +58,8 @@ private static String deviceName(String manufacturer, String model)
         }
         return manufacturer;
     }
+
+    public String toString() {
+        return ua;
+    }
 }

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

@@ -109,7 +109,7 @@ private static DnsManager initDns(Builder builder) {
             IResolver r1 = AndroidDnsServer.defaultResolver();
             IResolver r2 = null;
             try {
-                r2 = new Resolver(InetAddress.getByName("114.114.115.115"));
+                r2 = new Resolver(InetAddress.getByName("223.6.6.6"));
             } catch (IOException ex) {
                 ex.printStackTrace();
             }

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

@@ -53,17 +53,30 @@ final class ResumeUploader implements Runnable {
     private UpToken token;
     private boolean forceIp = false;
 
-    ResumeUploader(HttpManager httpManager, Configuration config, File file, String key, UpToken token,
-                   UpCompletionHandler completionHandler, UploadOptions options, String recorderKey) {
+    ResumeUploader(HttpManager httpManager, Configuration config, File f, String key, UpToken token,
+                   final UpCompletionHandler completionHandler, UploadOptions options, String recorderKey) {
         this.httpManager = httpManager;
         this.config = config;
-        this.f = file;
+        this.f = f;
         this.recorderKey = recorderKey;
-        this.size = (int) file.length();
+        this.size = (int) f.length();
         this.key = key;
         this.headers = new Header[1];
         headers[0] = new BasicHeader("Authorization", "UpToken " + token.token);
-        this.completionHandler = completionHandler;
+        this.file = null;
+        this.completionHandler = new UpCompletionHandler() {
+            @Override
+            public void complete(String key, ResponseInfo info, JSONObject response) {
+                if (file != null) {
+                    try {
+                        file.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+                completionHandler.complete(key, info, response);
+            }
+        };
         this.options = options != null ? options : UploadOptions.defaultOptions();
         chunkBuffer = new byte[config.chunkSize];
         long count = (size + Configuration.BLOCK_SIZE - 1) / Configuration.BLOCK_SIZE;

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

@@ -10,6 +10,7 @@
 /**
  * 七牛文件上传管理器
  *
+ *
  * 一般默认可以使用这个类的方法来上传数据和文件。这个类自动检测文件的大小，
  * 只要超过了{@link Configuration#putThreshold}
  */