fix: resolve multi-threaded unloading

skylot · Jan 20, 2020 · bb0fad2 · bb0fad2
1 parent 08f9722
commit bb0fad2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/jadx-core/src/main/java/jadx/api/JavaClass.java b/jadx-core/src/main/java/jadx/api/JavaClass.java
@@ -59,7 +59,7 @@ public void decompile() {
 
 	public synchronized void refresh() {
 		listsLoaded = false;
-		cls.reloadCode();
+		cls.reRunDecompile();
 	}
 
 	public synchronized String getSmali() {

diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java b/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
@@ -279,13 +279,21 @@ public ICodeInfo getCode() {
 		return decompile(true);
 	}
 
+	public synchronized ICodeInfo reRunDecompile() {
+		return decompile(false);
+	}
+
 	public synchronized ICodeInfo reloadCode() {
 		unload();
 		deepUnload();
 		return decompile(false);
 	}
 
-	private void deepUnload() {
+	public void deepUnload() {
+		if (cls == null) {
+			// manually added class
+			return;
+		}
 		clearAttributes();
 		root().getConstValues().removeForClass(this);
 		initialLoad();

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/RenameDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/RenameDialog.java
@@ -222,6 +222,10 @@ private int refreshState(RootNode rootNode) {
 		refreshTabs(mainWindow.getTabbedPane(), updatedClasses);
 
 		if (updatedClasses.size() > 0) {
+			for (JavaClass updatedClass : updatedClasses) {
+				updatedClass.unload();
+				updatedClass.getClassNode().deepUnload();
+			}
 			setRefreshTask(updatedClasses);
 		}