Do not leak client instance to DownloadWithUpdate

devgianlu · Feb 27, 2019 · f92b9f9 · f92b9f9
1 parent 6c7f5f4
commit f92b9f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/java/com/gianlu/aria2app/NetIO/AbstractClient.java b/app/src/main/java/com/gianlu/aria2app/NetIO/AbstractClient.java
@@ -54,7 +54,7 @@ public final <R> void send(@NonNull final AriaRequestWithResult<R> request, fina
             send(request.id, obj, new OnJson() {
                 @Override
                 public void onResponse(@NonNull JSONObject response) throws JSONException {
-                    R result = request.processor.process(AbstractClient.this, response);
+                    R result = request.processor.process(NetInstanceHolder.referenceFor(AbstractClient.this), response);
                     handler.post(() -> listener.onResult(result));
                 }
 

diff --git a/app/src/main/java/com/gianlu/aria2app/NetIO/Aria2/Aria2Helper.java b/app/src/main/java/com/gianlu/aria2app/NetIO/Aria2/Aria2Helper.java
@@ -63,7 +63,7 @@ public void getVersionAndSession(AbstractClient.OnResult<VersionAndSession> list
         client.batch(VERSION_AND_SESSION_BATCH_SANDBOX, listener);
     }
 
-    public void tellAllAndGlobalStats(final AbstractClient.OnResult<DownloadsAndGlobalStats> listener) {
+    public void tellAllAndGlobalStats(AbstractClient.OnResult<DownloadsAndGlobalStats> listener) {
         client.batch(DOWNLOADS_AND_GLOBAL_STATS_BATCH_SANDBOX, listener);
     }
 

diff --git a/app/src/main/java/com/gianlu/aria2app/NetIO/NetInstanceHolder.java b/app/src/main/java/com/gianlu/aria2app/NetIO/NetInstanceHolder.java
@@ -56,6 +56,12 @@ static void hasBeenClosed(@NonNull AbstractClient client) {
             instance.current = null;
     }
 
+    @NonNull
+    public static ClientInterface referenceFor(AbstractClient client) {
+        if (instance.current == client) return instance.reference;
+        else return client;
+    }
+
     private void handleInstantiate(@NonNull MultiProfile.UserProfile profile) throws AbstractClient.InitializationException {
         if (profile.connectionMethod == MultiProfile.ConnectionMethod.WEBSOCKET) {
             if (!(current instanceof WebSocketClient)) {