Merge pull request #243 from sxci/cancel

longbai · web-flow · commit 9f7a8aa6df86 · 2017-01-18T16:14:20.000+08:00
取消操作 [ci skip]
diff --git a/library/src/main/java/com/qiniu/android/http/Client.java b/library/src/main/java/com/qiniu/android/http/Client.java
@@ -304,7 +304,7 @@ public void accept(String key, Object value) {
         });
         mb.setType(MediaType.parse("multipart/form-data"));
         RequestBody body = mb.build();
-        if (progressHandler != null) {
+        if (progressHandler != null || cancellationHandler != null) {
             body = new CountingRequestBody(body, progressHandler, cancellationHandler);
         }
         Request.Builder requestBuilder = new Request.Builder().url(url).post(body);

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ public void accept(String key, Object value) {`
`304`	`304`	`});`
`305`	`305`	`mb.setType(MediaType.parse("multipart/form-data"));`
`306`	`306`	`RequestBody body = mb.build();`
`307`		`- if (progressHandler != null) {`
	`307`	`+ if (progressHandler != null \|\| cancellationHandler != null) {`
`308`	`308`	`body = new CountingRequestBody(body, progressHandler, cancellationHandler);`
`309`	`309`	`}`
`310`	`310`	`Request.Builder requestBuilder = new Request.Builder().url(url).post(body);`