rename

Author: longbai

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

@@ -35,7 +35,7 @@ public final class Configuration {
     public final Recorder recorder;
     public final KeyGenerator keyGen;
 
-    public final ProxyConfiguration proxyConfiguration;
+    public final ProxyConfiguration proxy;
 
     /**
      * 断点上传时的分片大小(可根据网络情况适当调整)
@@ -84,7 +84,7 @@ private Configuration(Builder builder) {
 
         retryMax = builder.retryMax;
 
-        proxyConfiguration = builder.proxyConfiguration;
+        proxy = builder.proxy;
 
         urlConverter = builder.urlConverter;
 
@@ -119,7 +119,7 @@ public static class Builder {
 
         private Recorder recorder = null;
         private KeyGenerator keyGen = null;
-        private ProxyConfiguration proxyConfiguration = null;
+        private ProxyConfiguration proxy = null;
 
         private int chunkSize = 256 * 1024;
         private int putThreshold = 512 * 1024;
@@ -160,8 +160,8 @@ public Builder recorder(Recorder recorder, KeyGenerator keyGen) {
             return this;
         }
 
-        public Builder proxy(ProxyConfiguration proxyConfiguration) {
-            this.proxyConfiguration = proxyConfiguration;
+        public Builder proxy(ProxyConfiguration proxy) {
+            this.proxy = proxy;
             return this;
         }
 

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

@@ -21,7 +21,7 @@ public UploadManager() {
 
     public UploadManager(Configuration config) {
         this.config = config;
-        this.client = new Client(config.proxyConfiguration, config.connectTimeout, config.responseTimeout,
+        this.client = new Client(config.proxy, config.connectTimeout, config.responseTimeout,
                 config.urlConverter, config.dns);
     }