fix(gui): ignore/limit waiting of canceled search task (#1568)

skylot · Jul 1, 2022 · 77732c8 · 77732c8
1 parent a67fc83
commit 77732c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/jadx-gui/src/main/java/jadx/gui/search/SearchTask.java b/jadx-gui/src/main/java/jadx/gui/search/SearchTask.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
@@ -65,6 +66,10 @@ public synchronized void fetchResults() {
 	}
 
 	public synchronized boolean addResult(JNode resultNode) {
+		if (isCanceled()) {
+			// ignore new results after cancel
+			return true;
+		}
 		this.results.accept(resultNode);
 		if (resultsLimit != 0 && resultsCount.incrementAndGet() >= resultsLimit) {
 			cancel();
@@ -76,9 +81,9 @@ public synchronized boolean addResult(JNode resultNode) {
 	public synchronized void waitTask() {
 		if (future != null) {
 			try {
-				future.get();
+				future.get(2, TimeUnit.SECONDS);
 			} catch (Exception e) {
-				LOG.error("Wait search task failed", e);
+				LOG.warn("Wait search task failed", e);
 			} finally {
 				future.cancel(true);
 				future = null;

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/SearchDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/dialog/SearchDialog.java
@@ -406,7 +406,6 @@ private boolean buildSearch(String text, SearchSettings searchSettings) {
 	private synchronized void stopSearchTask() {
 		if (searchTask != null) {
 			searchTask.cancel();
-			searchTask.waitTask();
 			searchTask = null;
 		}
 	}