fix: new option runProgressOnMainThread

Author: farfromrefug

packages/https/platforms/android/java/com/nativescript/https/OkHttpResponse.java

@@ -25,10 +25,12 @@ public class OkHttpResponse {
     private final static String TAG = "OkHttpResponse";
     static Handler mainHandler = null;
     static boolean RUN_ON_MAIN_THREAD = true;
+    static boolean RUN_PROGRESS_ON_MAIN_THREAD = true;
     public static final int DOWNLOAD_CHUNK_SIZE = 2048; // Same as Okio Segment.SIZE
 
     private ResponseBody responseBody;
     public boolean runOnMainThread = OkHttpResponse.RUN_ON_MAIN_THREAD;
+    public boolean runProgressOnMainThread = OkHttpResponse.RUN_PROGRESS_ON_MAIN_THREAD;
     public OkHttpResponseProgressCallback progressCallback = null;
     public OkHttpResponseCloseCallback closeCallback = null;
 
@@ -415,10 +417,7 @@ static String responseBodyToString(OkHttpResponse response) throws IOException {
     }
 
     public String asString() throws IOException {
-        // if (RUN_ON_MAIN_THREAD && getMainHandler().getLooper() === Looper.myLooper()) {
-        // } else {
         return responseBodyToString(this);
-        // }
     }
 
     public void asStringAsync(final OkHttpResponseAsyncCallback callback) {

src/https/request.android.ts

@@ -603,6 +603,9 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
                                 if (opts.responseOnMainThread === false) {
                                     nResponse.runOnMainThread = false;
                                 }
+                                if (opts.progressOnMainThread === false) {
+                                    nResponse.runProgressOnMainThread = false;
+                                }
                                 if (opts.onProgress) {
                                     nResponse.progressCallback = new OkHttpResponse.OkHttpResponseProgressCallback({
                                         onProgress: opts.onProgress

src/https/request.d.ts

@@ -63,6 +63,7 @@ export interface HttpsRequestOptions extends HttpRequestOptions {
      * default to true. Put to false to run response callback on current thread
      */
     responseOnMainThread?: boolean;
+    progressOnMainThread?: boolean;
 
     cachePolicy?: CachePolicy;
 

src/https/request.ios.ts

@@ -380,7 +380,7 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
 
     const progress = opts.onProgress
         ? (progress: NSProgress) => {
-              if (opts.responseOnMainThread === false) {
+              if (opts.progressOnMainThread === false) {
                   opts.onProgress(progress.completedUnitCount, progress.totalUnitCount);
               } else {
                   Utils.dispatchToMainThread(() => {

src/https/typings/android.d.ts

@@ -14,6 +14,7 @@ declare namespace com {
                 progressCallback: OkHttpResponse.OkHttpResponseProgressCallback;
                 closeCallback: OkHttpResponse.OkHttpResponseCloseCallback;
                 runOnMainThread: boolean;
+                runProgressOnMainThread: boolean;
                 constructor(body: okhttp3.ResponseBody);
                 contentLength(): number;
                 cancel();