fix(gui): trim trailing spaces in input files (#2244)

skylot · Aug 9, 2024 · 015876b · 015876b
1 parent 280f387
commit 015876b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java b/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java
@@ -343,6 +343,18 @@ public static List<Path> toPaths(File[] files) {
 		return Stream.of(files).map(File::toPath).collect(Collectors.toList());
 	}
 
+	public static List<Path> toPathsWithTrim(File[] files) {
+		return Stream.of(files).map(FileUtils::toPathWithTrim).collect(Collectors.toList());
+	}
+
+	public static Path toPathWithTrim(File file) {
+		return Path.of(file.getPath().stripTrailing());
+	}
+
+	public static Path toPathWithTrim(String file) {
+		return Path.of(file.stripTrailing());
+	}
+
 	public static List<Path> fileNamesToPaths(List<String> fileNames) {
 		return fileNames.stream().map(Paths::get).collect(Collectors.toList());
 	}

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileChooser.java b/jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileChooser.java
@@ -56,11 +56,11 @@ public List<Path> showDialog() {
 		data.setCurrentDir(getCurrentDirectory().toPath());
 		File[] selectedFiles = getSelectedFiles();
 		if (selectedFiles.length != 0) {
-			return FileUtils.toPaths(selectedFiles);
+			return FileUtils.toPathsWithTrim(selectedFiles);
 		}
 		File chosenFile = getSelectedFile();
 		if (chosenFile != null) {
-			return Collections.singletonList(chosenFile.toPath());
+			return Collections.singletonList(FileUtils.toPathWithTrim(chosenFile));
 		}
 		return Collections.emptyList();
 	}

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileDialog.java
@@ -37,10 +37,10 @@ public List<Path> showDialog() {
 		File[] selectedFiles = fileDialog.getFiles();
 		if (!Utils.isEmpty(selectedFiles)) {
 			data.setCurrentDir(Paths.get(fileDialog.getDirectory()));
-			return FileUtils.toPaths(selectedFiles);
+			return FileUtils.toPathsWithTrim(selectedFiles);
 		}
 		if (fileDialog.getFile() != null) {
-			return Collections.singletonList(Paths.get(fileDialog.getFile()));
+			return Collections.singletonList(FileUtils.toPathWithTrim(fileDialog.getFile()));
 		}
 		return Collections.emptyList();
 	}