feat(gui): allow to load multiple files, button for add files (#936)

skylot · Nov 2, 2020 · 278c5f6 · 278c5f6
1 parent 8ca3cd3
commit 278c5f6
Show file tree

Hide file tree

Showing 12 changed files with 177 additions and 62 deletions.
diff --git a/jadx-gui/src/main/java/jadx/gui/JadxWrapper.java b/jadx-gui/src/main/java/jadx/gui/JadxWrapper.java
@@ -1,6 +1,7 @@
 package jadx.gui;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -21,23 +22,25 @@
 import jadx.api.ResourceFile;
 import jadx.gui.settings.JadxSettings;
 
+import static jadx.gui.utils.FileUtils.toFiles;
+
 public class JadxWrapper {
 	private static final Logger LOG = LoggerFactory.getLogger(JadxWrapper.class);
 
 	private final JadxSettings settings;
 	private JadxDecompiler decompiler;
-	private File openFile;
+	private List<Path> openPaths = Collections.emptyList();
 
 	public JadxWrapper(JadxSettings settings) {
 		this.settings = settings;
 	}
 
-	public void openFile(File file) {
+	public void openFile(List<Path> paths) {
 		close();
-		this.openFile = file;
+		this.openPaths = paths;
 		try {
 			JadxArgs jadxArgs = settings.toJadxArgs();
-			jadxArgs.setInputFile(file);
+			jadxArgs.setInputFiles(toFiles(paths));
 
 			this.decompiler = new JadxDecompiler(jadxArgs);
 			this.decompiler.load();
@@ -55,6 +58,7 @@ public void close() {
 				LOG.error("jadx decompiler close error", e);
 			}
 		}
+		this.openPaths = Collections.emptyList();
 	}
 
 	public void saveAll(File dir, ProgressMonitor progressMonitor) {
@@ -139,8 +143,13 @@ public List<ResourceFile> getResources() {
 		return decompiler.getResources();
 	}
 
+	@Deprecated
 	public File getOpenFile() {
-		return openFile;
+		return openPaths.get(0).toFile();
+	}
+
+	public List<Path> getOpenPaths() {
+		return openPaths;
 	}
 
 	public JadxDecompiler getDecompiler() {

diff --git a/jadx-gui/src/main/java/jadx/gui/settings/JadxProject.java b/jadx-gui/src/main/java/jadx/gui/settings/JadxProject.java
@@ -64,13 +64,13 @@ private void setProjectPath(Path projectPath) {
 		changed();
 	}
 
-	public Path getFilePath() {
-		return filesPath == null ? null : filesPath.get(0);
+	public List<Path> getFilePaths() {
+		return filesPath;
 	}
 
-	public void setFilePath(Path filePath) {
-		if (!filePath.equals(getFilePath())) {
-			this.filesPath = Arrays.asList(filePath);
+	public void setFilePath(List<Path> files) {
+		if (!files.equals(getFilePaths())) {
+			this.filesPath = files;
 			changed();
 		}
 	}

diff --git a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java b/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
@@ -5,6 +5,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -152,8 +153,8 @@ public void setCheckForUpdates(boolean checkForUpdates) {
 		sync();
 	}
 
-	public Iterable<Path> getRecentProjects() {
-		return recentProjects;
+	public List<Path> getRecentProjects() {
+		return Collections.unmodifiableList(recentProjects);
 	}
 
 	public void addRecentProject(Path projectPath) {
@@ -194,11 +195,15 @@ public boolean loadWindowPos(Window window) {
 	}
 
 	private static boolean isContainedInAnyScreen(WindowLocation pos) {
-		for (GraphicsDevice gd : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()) {
-			if (gd.getDefaultConfiguration().getBounds().contains(pos.getBounds())) {
-				return true;
+		Rectangle bounds = pos.getBounds();
+		if (bounds.getX() > 0 && bounds.getY() > 0) {
+			for (GraphicsDevice gd : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()) {
+				if (gd.getDefaultConfiguration().getBounds().contains(bounds)) {
+					return true;
+				}
 			}
 		}
+		LOG.debug("Window saved position was ignored: {}", pos);
 		return false;
 	}
 

diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
@@ -1,6 +1,7 @@
 package jadx.gui.treemodel;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -124,7 +125,14 @@ public int getLine() {
 
 	@Override
 	public String makeString() {
-		File file = wrapper.getOpenFile();
-		return file != null ? file.getName() : "File not open";
+		List<Path> paths = wrapper.getOpenPaths();
+		int count = paths.size();
+		if (count == 0) {
+			return "File not open";
+		}
+		if (count == 1) {
+			return paths.get(0).getFileName().toString();
+		}
+		return count + " files";
 	}
 }
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/MainDropTarget.java b/jadx-gui/src/main/java/jadx/gui/ui/MainDropTarget.java
@@ -13,6 +13,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static jadx.gui.utils.FileUtils.toPaths;
+
 /**
  * Enables drop support from external applications for the {@link MainWindow} (load dropped APK
  * file)
@@ -62,8 +64,7 @@ public void drop(DropTargetDropEvent dtde) {
 			List<File> transferData = (List<File>) transferable.getTransferData(DataFlavor.javaFileListFlavor);
 			if (!transferData.isEmpty()) {
 				dtde.dropComplete(true);
-				// load first file
-				mainWindow.open(transferData.get(0).toPath());
+				mainWindow.open(toPaths(transferData));
 			}
 		} catch (Exception e) {
 			LOG.error("File drop operation failed", e);