Fix Upload Progress For MultiPart Files

Reza Amuzadeh · Reza Amuzadeh · commit 81bfb99fa7ce · 2019-08-05T16:37:24.000+03:30
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
diff --git a/app/src/main/java/com/github/restclient/MainActivity.java b/app/src/main/java/com/github/restclient/MainActivity.java
@@ -39,6 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.buttonCallWithCP).setOnClickListener(view -> {
             callFourSquare();
         });
+
     }
 
     private void initRestClient() {
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,8 +6,8 @@ buildscript {
     extra.set("compileSdk", 28)
     extra.set("targetSdk", 28)
     extra.set("buildTools", "28.0.3")
-    extra.set("version_code", 13)
-    extra.set("version_name", "1.1.4")
+    extra.set("version_code", 14)
+    extra.set("version_name", "1.1.5")
 
     repositories {
         google()
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -36,9 +36,9 @@ android {
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
 
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${rootProject.extra.get("kotlinVersion")}")
     implementation("androidx.appcompat:appcompat:1.0.2")
     implementation("com.squareup.okhttp3:okhttp:3.14.2")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${rootProject.extra.get("kotlinVersion")}")
 
     testImplementation("junit:junit:4.12")
     androidTestImplementation("androidx.test:runner:1.2.0")
diff --git a/library/src/main/java/com/github/library/Interface/ResultHandler.java b/library/src/main/java/com/github/library/Interface/ResultHandler.java
@@ -1,6 +1,5 @@
 package com.github.library.Interface;
 
-
 import com.github.library.enums.ErrorCode;
 
 import java.io.ByteArrayOutputStream;
@@ -11,43 +10,46 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-
 /**
  * Created by alishatergholi on 12/16/17.
  */
+
 public abstract class ResultHandler {
 
-    public void onResultHandler(Response response){
+    public void onResultHandler(Response response) {
         String url = response.request().url().url().toString();
         if (response.body() != null && response.isSuccessful()) {
             ResponseBody body = response.body();
             InputStream inputStream = body.byteStream();
             try {
                 ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                 int next = inputStream.read();
-                while (next > -1){
+                while (next > -1) {
                     outputStream.write(next);
                     next = inputStream.read();
                 }
                 outputStream.flush();
                 byte[] result = outputStream.toByteArray();
                 outputStream.close();
-                this.onSuccess(url,result);
+                this.onSuccess(url, result);
             } catch (IOException e) {
-                this.onFailure(url,ErrorCode.IOException);
+                this.onFailure(url, ErrorCode.IOException);
             }
         } else {
-            this.onFailure(url,ErrorCode.Parse(response.code()));
+            this.onFailure(url, ErrorCode.Parse(response.code()));
         }
     }
 
-    protected abstract void onSuccess(String url,byte[] result);
+    protected abstract void onSuccess(String url, byte[] result);
 
-    public void onProgress(double percent,long bytesWritten,long totalSize){
+    public void onProgress(double percent, long bytesWritten, long totalSize) {
 
     }
 
-    public abstract void onFailure(String url,ErrorCode errorCode);
+    protected void onProgress(final double percent, final long bytesWritten, final long totalSize, final int speed) {
+    }
+
+    public abstract void onFailure(String url, ErrorCode errorCode);
 
     protected static String calcTime(Long startTime) {
         Long duration = getTimeMillisecond() - startTime;
@@ -71,4 +73,5 @@ protected static String calcFileSize(byte[] result) {
         }
         return modifiedFileSize;
     }
+
 }
diff --git a/library/src/main/java/com/github/library/RestClient.java b/library/src/main/java/com/github/library/RestClient.java
@@ -3,7 +3,6 @@
  */
 package com.github.library;
 
-
 import android.content.Context;
 
 import androidx.collection.ArrayMap;
diff --git a/library/src/main/java/com/github/library/enums/AuthState.java b/library/src/main/java/com/github/library/enums/AuthState.java
@@ -1,5 +1,6 @@
 package com.github.library.enums;
 
+
 public class AuthState {
 
     public static final int ACCESS_TOKEN = 0;
diff --git a/library/src/main/java/com/github/library/enums/AuthType.java b/library/src/main/java/com/github/library/enums/AuthType.java
@@ -1,5 +1,6 @@
 package com.github.library.enums;
 
+
 public enum AuthType {
 
     NO_AUTH(0),
diff --git a/library/src/main/java/com/github/library/enums/ErrorCode.java b/library/src/main/java/com/github/library/enums/ErrorCode.java
@@ -1,9 +1,6 @@
 package com.github.library.enums;
 
 
-/**
- * Created by alishatergholi on 2/17/18.
- */
 public enum ErrorCode {
 
     AuthorizationException(401,"Authorization Exception"),
diff --git a/library/src/main/java/com/github/library/enums/RequestBodyType.java b/library/src/main/java/com/github/library/enums/RequestBodyType.java
@@ -1,7 +1,5 @@
 package com.github.library.enums;
 
-
-
 public enum RequestBodyType {
 
     FormData(0),
@@ -13,7 +11,7 @@ public enum RequestBodyType {
 
     int value = -1;
 
-    RequestBodyType(int value){
+    RequestBodyType(int value) {
         this.value = value;
     }
 
@@ -29,5 +27,4 @@ public static RequestBodyType Parse(int value) {
         }
         return FormData;
     }
-
 }
diff --git a/library/src/main/java/com/github/library/model/AuthModel.java b/library/src/main/java/com/github/library/model/AuthModel.java
@@ -1,13 +1,11 @@
 package com.github.library.model;
 
-
 import androidx.collection.ArrayMap;
 
 import com.github.library.enums.AuthType;
 
 import okhttp3.Credentials;
 
-
 public class AuthModel {
 
     private String clientId;
diff --git a/library/src/main/java/com/github/library/requestMethod/POST.java b/library/src/main/java/com/github/library/requestMethod/POST.java
@@ -3,6 +3,10 @@
 import android.os.Handler;
 import android.os.Looper;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.collection.ArrayMap;
+
 import com.github.library.Interface.ResultHandler;
 import com.github.library.enums.AuthType;
 import com.github.library.enums.ErrorCode;
@@ -19,9 +23,6 @@
 
 import java.io.IOException;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.collection.ArrayMap;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.OkHttpClient;
@@ -39,17 +40,20 @@ public synchronized static void no_Auth(
             @NonNull RequestParams params,
             @NonNull ResultHandler responder) {
         try {
-            RequestBody requestBody;
-            if (params.getType() == RequestBodyType.MultiPart)
-                requestBody = new RequestBodyProgressive(params.getRequestForm(), (bytesWritten, contentLength) ->
-                        new Handler(Looper.getMainLooper()).post(() -> {
-                            double percent = (double) bytesWritten / (double) contentLength;
-                            percent = Math.floor(percent * 100) / 1;
-                            responder.onProgress(percent, bytesWritten, contentLength);
-                        }));
-            else {
-                requestBody = params.getRequestForm();
+
+            RequestBody requestBody = params.getRequestForm();
+
+            if (params.getType() == RequestBodyType.MultiPart) {
+                requestBody = new RequestBodyProgressive(requestBody, new RequestBodyProgressive.Listener() {
+                    @Override
+                    public void onRequestProgress(long bytesWritten, long contentLength) {
+                        double percent = (double) bytesWritten / (double) contentLength;
+                        percent = Math.floor(percent * 100) / 1;
+                        responder.onProgress(percent, bytesWritten, contentLength);
+                    }
+                });
             }
+
             Request.Builder request = new Request.Builder()
                     .url(url)
                     .tag(tag)
diff --git a/library/src/main/java/com/github/library/response/ResponseFileHandler.java b/library/src/main/java/com/github/library/response/ResponseFileHandler.java
@@ -20,7 +20,7 @@ protected void onSuccess(String url, byte[] result) {
     @Override
     public void onProgress(final double percent, final long bytesWritten, final long totalSize) {
         super.onProgress(percent, bytesWritten, totalSize);
-        new Handler(Looper.getMainLooper()).post(() -> onProgress(percent, bytesWritten, totalSize));
+        new Handler(Looper.getMainLooper()).post(() -> onProgress(percent, bytesWritten, totalSize, 0));
     }
 
     @Override
diff --git a/library/src/main/java/com/github/library/utils/RequestParams.java b/library/src/main/java/com/github/library/utils/RequestParams.java
@@ -200,23 +200,22 @@ public RequestBody getRequestForm() {
             case Binary:
                 return RequestBody.create(MediaType.parse(contentType), binaryInput);
             case MultiPart:
-                MultipartBody.Builder builder = new MultipartBody.Builder().setType(MultipartBody.FORM);
+                MultipartBody.Builder requestBody = new MultipartBody.Builder().setType(MultipartBody.FORM);
                 for (String key : getParams().keySet()) {
-                    builder.addFormDataPart(key, (String) Objects.requireNonNull(getParams().get(key)));
+                    requestBody.addFormDataPart(key, (String) Objects.requireNonNull(getParams().get(key)));
                 }
                 for (String key : getParamsArray().keySet()) {
                     for (Object item : Objects.requireNonNull(getParamsArray().get(key))) {
-                        builder.addFormDataPart(key, (String) item);
+                        requestBody.addFormDataPart(key, (String) item);
                     }
                 }
-                LinkedHashMap<String, FileModel> fileParams = getFileParams();
-                for (String key : fileParams.keySet()) {
+                for (String key : getFileParams().keySet()) {
                     FileModel uploadFile = fileParams.get(key);
                     if (uploadFile != null) {
-                        builder.addFormDataPart(key, uploadFile.getFileName(), RequestBody.create(uploadFile.getMimeType(), uploadFile.getFile()));
+                        requestBody.addFormDataPart(key, uploadFile.getFileName(), RequestBody.create(uploadFile.getMimeType(), uploadFile.getFile()));
                     }
                 }
-                return builder.build();
+                return requestBody.build();
             case FormData:
             case FormUrlEncode:
             default: {

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {`
`39`	`39`	`findViewById(R.id.buttonCallWithCP).setOnClickListener(view -> {`
`40`	`40`	`callFourSquare();`
`41`	`41`	`});`
	`42`	`+`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`private void initRestClient() {`