format

Author: longbai

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

@@ -19,10 +19,8 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import okhttp3.Authenticator;
 import okhttp3.Call;
 import okhttp3.Callback;
-import okhttp3.Credentials;
 import okhttp3.Dns;
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
@@ -31,8 +29,6 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
-import okhttp3.Response;
-import okhttp3.Route;
 
 /**
  * Created by bailong on 15/11/12.
@@ -55,7 +51,7 @@ public Client(ProxyConfiguration proxy, int connectTimeout, int responseTimeout,
 
         if (proxy != null) {
             builder.proxy(proxy.proxy());
-            if (proxy.user != null && proxy.password != null){
+            if (proxy.user != null && proxy.password != null) {
                 builder.proxyAuthenticator(proxy.authenticator());
             }
         }

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

@@ -36,11 +36,12 @@ public ProxyConfiguration(String hostAddress, int port, String user, String pass
     public ProxyConfiguration(String hostAddress, int port) {
         this(hostAddress, port, null, null, Proxy.Type.HTTP);
     }
-    Proxy proxy(){
+
+    Proxy proxy() {
         return new Proxy(type, new InetSocketAddress(hostAddress, port));
     }
 
-    Authenticator authenticator(){
+    Authenticator authenticator() {
         return new Authenticator() {
             @Override
             public okhttp3.Request authenticate(Route route, okhttp3.Response response) throws IOException {

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

@@ -105,7 +105,7 @@ private static boolean isNotChunkToQiniu(ResponseInfo info, JSONObject response)
     }
 
     public void run() {
-        int offset = recoveryFromRecord();
+        long offset = recoveryFromRecord();
         try {
             file = new RandomAccessFile(f, "r");
         } catch (FileNotFoundException e) {
@@ -126,7 +126,7 @@ public void run() {
      * @param progress           上传进度
      * @param _completionHandler 上传完成处理动作
      */
-    private void makeBlock(URI address, int offset, int blockSize, int chunkSize, ProgressHandler progress,
+    private void makeBlock(URI address, long offset, int blockSize, int chunkSize, ProgressHandler progress,
                            CompletionHandler _completionHandler, UpCancellationSignal c) {
         String path = format(Locale.ENGLISH, "/mkblk/%d", blockSize);
         try {
@@ -141,9 +141,9 @@ private void makeBlock(URI address, int offset, int blockSize, int chunkSize, Pr
         post(u, chunkBuffer, 0, chunkSize, progress, _completionHandler, c);
     }
 
-    private void putChunk(URI address, int offset, int chunkSize, String context, ProgressHandler progress,
+    private void putChunk(URI address, long offset, int chunkSize, String context, ProgressHandler progress,
                           CompletionHandler _completionHandler, UpCancellationSignal c) {
-        int chunkOffset = offset % Configuration.BLOCK_SIZE;
+        int chunkOffset = (int) (offset % Configuration.BLOCK_SIZE);
         String path = format(Locale.ENGLISH, "/bput/%s/%d", context, chunkOffset);
         try {
             file.seek(offset);
@@ -195,12 +195,12 @@ private void post(URI uri, byte[] data, int offset, int size, ProgressHandler pr
         client.asyncPost(uri.toString(), data, offset, size, headers, progress, completion, c);
     }
 
-    private long calcPutSize(int offset) {
+    private long calcPutSize(long offset) {
         long left = size - offset;
         return left < config.chunkSize ? left : config.chunkSize;
     }
 
-    private long calcBlockSize(int offset) {
+    private long calcBlockSize(long offset) {
         long left = size - offset;
         return left < Configuration.BLOCK_SIZE ? left : Configuration.BLOCK_SIZE;
     }
@@ -209,7 +209,7 @@ private boolean isCancelled() {
         return options.cancellationSignal.isCancelled();
     }
 
-    private void nextTask(final int offset, final int retried, final URI address) {
+    private void nextTask(final long offset, final int retried, final URI address) {
         if (isCancelled()) {
             ResponseInfo i = ResponseInfo.cancelled();
             completionHandler.complete(key, i, null);
@@ -239,7 +239,7 @@ public void complete(ResponseInfo info, JSONObject response) {
             return;
         }
 
-        final int chunkSize = (int)calcPutSize(offset);
+        final int chunkSize = (int) calcPutSize(offset);
         ProgressHandler progress = new ProgressHandler() {
             @Override
             public void onProgress(int bytesWritten, int totalSize) {
@@ -279,24 +279,24 @@ public void complete(ResponseInfo info, JSONObject response) {
                 try {
                     context = response.getString("ctx");
                     crc = response.getLong("crc32");
-                } catch (JSONException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
                 if ((context == null || crc != ResumeUploader.this.crc32) && retried < config.retryMax) {
                     nextTask(offset, retried + 1, config.upBackup.address);
                     return;
                 }
-                contexts[offset / Configuration.BLOCK_SIZE] = context;
+                contexts[(int) (offset / Configuration.BLOCK_SIZE)] = context;
                 record(offset + chunkSize);
                 nextTask(offset + chunkSize, retried, address);
             }
         };
         if (offset % Configuration.BLOCK_SIZE == 0) {
-            int blockSize = (int)calcBlockSize(offset);
+            int blockSize = (int) calcBlockSize(offset);
             makeBlock(address, offset, blockSize, chunkSize, progress, complete, options.cancellationSignal);
             return;
         }
-        String context = contexts[offset / Configuration.BLOCK_SIZE];
+        String context = contexts[(int) (offset / Configuration.BLOCK_SIZE)];
         putChunk(address, offset, chunkSize, context, progress, complete, options.cancellationSignal);
     }
 
@@ -343,7 +343,7 @@ private void removeRecord() {
     //    "modify_time": lastFileModifyTime,
     //    "contexts": contexts
     //}
-    private void record(int offset) {
+    private void record(long offset) {
         if (config.recorder == null || offset == 0) {
             return;
         }