Close clients used for testing (drawer) + release LoadingActivity client

devgianlu · Feb 27, 2019 · a1cab82 · a1cab82
1 parent f57b404
commit a1cab82
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/app/src/main/java/com/gianlu/aria2app/LoadingActivity.java b/app/src/main/java/com/gianlu/aria2app/LoadingActivity.java
@@ -309,6 +309,8 @@ private void launchWebView() {
 
     @Override
     public boolean onConnected(@NonNull AbstractClient client) {
+        ongoingTest = null;
+
         if (shareData != null) {
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setTitle(R.string.useWebView)
@@ -375,6 +377,8 @@ private void failedConnecting(@NonNull Throwable ex) {
 
     @Override
     public void onFailedConnecting(@NonNull MultiProfile.UserProfile profile, @NonNull Throwable ex) {
+        ongoingTest = null;
+
         if (profile.couldBeAria2Android(this)) mayStartAria2Android(profile, ex);
         else failedConnecting(ex);
     }

diff --git a/app/src/main/java/com/gianlu/aria2app/NetIO/WebSocketClient.java b/app/src/main/java/com/gianlu/aria2app/NetIO/WebSocketClient.java
@@ -8,6 +8,7 @@
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 import java.security.GeneralSecurityException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -24,7 +25,7 @@
 
 public class WebSocketClient extends AbstractClient {
     private final Map<Long, InternalResponse> requests = new ConcurrentHashMap<>();
-    private final WebSocket webSocket;
+    private final WeakReference<WebSocket> webSocket;
     private final long initializedAt;
     private final ExecutorService executorService = Executors.newCachedThreadPool();
     private final boolean closeAfterTest;
@@ -33,7 +34,7 @@ public class WebSocketClient extends AbstractClient {
     @UiThread
     private WebSocketClient(@NonNull MultiProfile.UserProfile profile, boolean close) throws GeneralSecurityException, NetUtils.InvalidUrlException, IOException {
         super(profile);
-        webSocket = client.newWebSocket(NetUtils.createWebsocketRequest(profile), new Listener());
+        webSocket = new WeakReference<>(client.newWebSocket(NetUtils.createWebsocketRequest(profile), new Listener()));
         initializedAt = System.currentTimeMillis();
         closeAfterTest = close;
     }
@@ -47,7 +48,7 @@ private WebSocketClient(@NonNull MultiProfile.UserProfile profile, @Nullable OnC
     @NonNull
     static WebSocketClient instantiate(@NonNull MultiProfile.UserProfile profile) throws InitializationException {
         try {
-            return new WebSocketClient(profile, true);
+            return new WebSocketClient(profile, false);
         } catch (NetUtils.InvalidUrlException | GeneralSecurityException | IOException ex) {
             throw new InitializationException(ex);
         }
@@ -66,7 +67,10 @@ public static Closeable checkConnection(@NonNull MultiProfile.UserProfile profil
     @Override
     protected void closeClient() {
         connectionListener = null;
-        if (webSocket != null) webSocket.close(1000, null);
+        if (webSocket.get() != null) {
+            webSocket.get().close(1000, null);
+            webSocket.clear();
+        }
 
         for (InternalResponse internal : requests.values())
             internal.exception(new IOException("Client has been closed."));
@@ -88,13 +92,13 @@ public void send(long id, @NonNull JSONObject request, @NonNull OnJson listener)
     @Override
     @WorkerThread
     public JSONObject sendSync(long id, @NonNull JSONObject request) throws Exception {
-        if (closed)
+        if (closed || webSocket.get() == null)
             throw new IllegalStateException("Client is closed: " + this);
 
         InternalResponse internal = new InternalResponse();
 
         requests.put(id, internal);
-        webSocket.send(request.toString());
+        webSocket.get().send(request.toString());
 
         synchronized (internal) {
             internal.wait(5000);

diff --git a/app/src/main/java/com/gianlu/aria2app/ProfilesManager/CustomProfilesAdapter.java b/app/src/main/java/com/gianlu/aria2app/ProfilesManager/CustomProfilesAdapter.java
@@ -118,7 +118,7 @@ private void itemChanged(@NonNull String profileId, long ping) {
 
     @Override
     protected void runTest(int pos) {
-        executorService.execute(new NetTester(context, getItem(pos).getProfile(context), this));
+        executorService.execute(new NetTester(context, getItem(pos).getProfile(context), true, this));
     }
 
     @Override

diff --git a/app/src/main/java/com/gianlu/aria2app/ProfilesManager/Testers/NetTester.java b/app/src/main/java/com/gianlu/aria2app/ProfilesManager/Testers/NetTester.java
@@ -16,15 +16,18 @@
 import androidx.annotation.UiThread;
 
 public class NetTester extends BaseTester<AbstractClient> {
+    private final boolean close;
     private final ProfileTesterCallback profileListener;
 
     NetTester(Context context, MultiProfile.UserProfile profile, PublishListener<AbstractClient> listener) {
         super(context, profile, listener);
         this.profileListener = null;
+        this.close = false;
     }
 
-    public NetTester(Context context, MultiProfile.UserProfile profile, ProfileTesterCallback profileListener) {
+    public NetTester(Context context, MultiProfile.UserProfile profile, boolean close, ProfileTesterCallback profileListener) {
         super(context, profile, null);
+        this.close = close;
         this.profileListener = profileListener;
     }
 
@@ -76,7 +79,9 @@ public void onFailedConnecting(@NonNull MultiProfile.UserProfile profile, @NonNu
                 Logging.log(ex);
             }
 
-            return lock.get();
+            AbstractClient client = lock.get();
+            if (close && client != null) client.close();
+            return client;
         }
     }