chang IRequestClient api

qiniu · Nov 22, 2021 · d3aa558 · d3aa558
1 parent ef92a80
commit d3aa558
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/library/src/main/java/com/qiniu/android/http/connectCheck/ConnectChecker.java b/library/src/main/java/com/qiniu/android/http/connectCheck/ConnectChecker.java
@@ -133,7 +133,7 @@ public Object call() throws Exception {
         SystemHttpClient client = new SystemHttpClient();
 
         LogUtil.i("== checkHost:" + host);
-        client.request(request, null, true, null, null, new IRequestClient.RequestClientCompleteHandler() {
+        client.request(request, new IRequestClient.Options(null, true, null), null, new IRequestClient.RequestClientCompleteHandler() {
             @Override
             public void complete(ResponseInfo responseInfo, UploadSingleRequestMetrics metrics, JSONObject response) {
                 synchronized (this) {

diff --git a/library/src/main/java/com/qiniu/android/http/request/HttpSingleRequest.java b/library/src/main/java/com/qiniu/android/http/request/HttpSingleRequest.java
@@ -96,7 +96,7 @@ public boolean checkCancel() {
                 " url:" + StringUtils.toNonnullString(request.urlString) +
                 " ip:" + StringUtils.toNonnullString(server.getIp()));
 
-        client.request(request, server, isAsync, config.proxy, new IRequestClient.RequestClientProgress() {
+        client.request(request, new IRequestClient.Options(server, isAsync, config.proxy), new IRequestClient.RequestClientProgress() {
             @Override
             public void progress(long totalBytesWritten, long totalBytesExpectedToWrite) {
                 if (checkCancelHandler.checkCancel()) {

diff --git a/library/src/main/java/com/qiniu/android/http/request/IRequestClient.java b/library/src/main/java/com/qiniu/android/http/request/IRequestClient.java
@@ -18,9 +18,7 @@ public interface RequestClientCompleteHandler {
     }
 
     public abstract void request(Request request,
-                                 IUploadServer server,
-                                 boolean isAsync,
-                                 ProxyConfiguration connectionProxy,
+                                 Options options,
                                  RequestClientProgress progress,
                                  RequestClientCompleteHandler complete);
 
@@ -29,4 +27,16 @@ public abstract void request(Request request,
     public String getClientId() {
         return "customized";
     }
+
+    public static class Options {
+        public final IUploadServer server;
+        public final boolean isAsync;
+        public final ProxyConfiguration connectionProxy;
+
+        public Options(IUploadServer server, boolean isAsync, ProxyConfiguration connectionProxy) {
+            this.server = server;
+            this.isAsync = isAsync;
+            this.connectionProxy = connectionProxy;
+        }
+    }
 }
diff --git a/library/src/main/java/com/qiniu/android/http/request/httpclient/SystemHttpClient.java b/library/src/main/java/com/qiniu/android/http/request/httpclient/SystemHttpClient.java
@@ -74,26 +74,32 @@ public void request(Request request,
                         ProxyConfiguration connectionProxy,
                         RequestClientProgress progress,
                         RequestClientCompleteHandler complete) {
-        request(request, null, isAsync, connectionProxy, progress, complete);
+        request(request, new Options(null, isAsync, connectionProxy), progress, complete);
     }
 
     @Override
     public void request(Request request,
-                        IUploadServer server,
-                        boolean isAsync,
-                        ProxyConfiguration connectionProxy,
+                        Options options,
                         RequestClientProgress progress,
                         RequestClientCompleteHandler complete) {
+        IUploadServer server = null;
+        boolean isAsync = true;
+        ProxyConfiguration connectionProxy = null;
+        if (options != null) {
+            server = options.server;
+            isAsync = options.isAsync;
+            connectionProxy = options.connectionProxy;
+        }
 
         metrics = new UploadSingleRequestMetrics();
         metrics.start();
         metrics.setClientName(getClientId());
         metrics.setClientVersion(getOkHttpVersion());
         if (server != null) {
+            currentServer = server;
             metrics.setRemoteAddress(server.getIp());
         }
         metrics.setRequest(request);
-        currentServer = server;
         currentRequest = request;
         requestProgress = progress;
         completeHandler = complete;