From b9a55799feb823971cb3768dcfa5cfdaceb3e483 Mon Sep 17 00:00:00 2001
From: Sunmisc <zelvalea@gmail.com>
Date: Wed, 5 Oct 2022 15:49:25 +0300
Subject: [PATCH] fixed redundant thread creation

---
 .../java/ru/vtosters/lite/net/NetCall.java    | 41 +++++++++----------
 .../java/ru/vtosters/lite/net/NetClient.java  |  6 ++-
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/net/NetCall.java b/app/src/main/java/ru/vtosters/lite/net/NetCall.java
index d13545618..23d1f9484 100644
--- a/app/src/main/java/ru/vtosters/lite/net/NetCall.java
+++ b/app/src/main/java/ru/vtosters/lite/net/NetCall.java
@@ -15,24 +15,32 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public final class NetCall {
     private final NetRequest req;
     private final NetClient cl;
+    private final Executor executor;
 
-    protected NetCall(NetClient cl, NetRequest req) {
+    protected NetCall(NetClient cl, NetRequest req, Executor executor) {
         this.req = req;
         this.cl = cl;
+        this.executor = executor;
     }
 
     private static String constructArgs(Map<String, String> args) throws UnsupportedEncodingException {
         args = new TreeMap<>(args);
-        String str = "";
+        StringBuilder str = new StringBuilder();
         for (Map.Entry<String, String> en : args.entrySet()) {
-            if (!str.isEmpty()) str += "&";
-            str += URLEncoder.encode(en.getKey(), "UTF-8") + "=" + URLEncoder.encode(en.getValue(), "UTF-8");
+            if (str.length() > 0)
+                str.append("&");
+            str.append(URLEncoder.encode(en.getKey(), "UTF-8"))
+                    .append("=")
+                    .append(URLEncoder.encode(en.getValue(), "UTF-8"));
         }
-        return str;
+        return str.toString();
     }
 
     public NetRequest request() {
@@ -77,22 +85,13 @@ public final class NetCall {
     }
 
     public void enqueue(NetCallback cb) {
-        new Thread() {
-            @Override
-            public void run() {
-                try {
-                    NetResponse resp = execute();
-                    cb.onResponse(NetCall.this, resp);
-                } catch (IOException e) {
-                    cb.onFailure(NetCall.this, e);
-                }
-                try {
-                    interrupt();
-                    join();
-                } catch (Exception e) {
-                    Log.e("NetCall", "Failed to interrupt and join thread", e);
-                }
+        executor.execute(() -> {
+            try {
+                NetResponse resp = execute();
+                cb.onResponse(NetCall.this, resp);
+            } catch (IOException e) {
+                cb.onFailure(NetCall.this, e);
             }
-        }.start();
+        });
     }
 }
diff --git a/app/src/main/java/ru/vtosters/lite/net/NetClient.java b/app/src/main/java/ru/vtosters/lite/net/NetClient.java
index d3a89961e..2d5169cae 100644
--- a/app/src/main/java/ru/vtosters/lite/net/NetClient.java
+++ b/app/src/main/java/ru/vtosters/lite/net/NetClient.java
@@ -2,12 +2,16 @@ package ru.vtosters.lite.net;
 
 import java.net.PasswordAuthentication;
 import java.net.Proxy;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 public class NetClient {
     private final long timeout;
     private final Proxy proxy;
     private final PasswordAuthentication authenticator;
+    private final Executor executor
+            = Executors.newSingleThreadExecutor();
 
     protected NetClient(Builder b) {
         timeout = b.timeout;
@@ -24,7 +28,7 @@ public class NetClient {
     }
 
     public NetCall newCall(NetRequest req) {
-        return new NetCall(this, req);
+        return new NetCall(this, req, executor);
     }
 
     public PasswordAuthentication getAuthenticator() {