jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat(gui): make search bar usable for smali code (PR #652)

Browse Source
This commit is contained in:
Jan S
2019-04-30 23:17:08 +02:00
committed by skylot
parent c7890f2468
commit 4a39af7cb3
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/api/JadxDecompiler.java
+1 -3
View File
@@ -2,9 +2,7 @@ package jadx.api;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
@@ -312,7 +310,7 @@ public final class JadxDecompiler {
Path path = cls.dex().getDexFile().getPath();
String className = cls.getAlias().makeRawFullName();
className = 'L' + className.replace('.', '/') + ';';
try (InputStream in = Files.newInputStream(path)) {
try {
DexBackedDexFile dexFile = DexFileFactory.loadDexFile(path.toFile(), Opcodes.getDefault());
boolean decompiled = false;
for (DexBackedClassDef classDef : dexFile.getClasses()) {
jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java
+6 -1
View File
@@ -45,11 +45,16 @@ public final class CodePanel extends ContentPanel {
add(areaTabbedPane);
KeyStroke key = KeyStroke.getKeyStroke(KeyEvent.VK_F, Utils.ctrlButton());
Utils.addKeyBinding(codeArea, key, "SearchAction", new SearchAction());
SearchAction searchAction = new SearchAction();
Utils.addKeyBinding(codeArea, key, "SearchAction", searchAction);
Utils.addKeyBinding(smaliArea, key, "SearchAction", searchAction);
areaTabbedPane.addChangeListener(e -> {
if (areaTabbedPane.getSelectedComponent() == smaliScrollPane) {
smaliArea.load();
searchBar.setRTextArea(smaliArea);
} else if (areaTabbedPane.getSelectedComponent() == codeScrollPane) {
searchBar.setRTextArea(codeArea);
}
});
}
jadx-gui/src/main/java/jadx/gui/ui/codearea/SearchBar.java
+8 -1
View File
@@ -32,7 +32,7 @@ class SearchBar extends JToolBar {
private static final Icon ICON_DOWN = Utils.openIcon("arrow_down");
private static final Icon ICON_CLOSE = Utils.openIcon("cross");
private final RSyntaxTextArea rTextArea;
private RSyntaxTextArea rTextArea;
private final JTextField searchField;
private final JCheckBox markAllCB;
@@ -168,4 +168,11 @@ class SearchBar extends JToolBar {
searchField.setBackground(COLOR_BG_NORMAL);
}
}
public void setRTextArea(RSyntaxTextArea rTextArea) {
this.rTextArea = rTextArea;
if (isVisible()) {
this.search(0);
}
}
}
jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliArea.java
+1
View File
@@ -18,6 +18,7 @@ public final class SmaliArea extends RSyntaxTextArea {
void load() {
if (getText().isEmpty()) {
setText(node.getSmali());
setCaretPosition(0);
}
}
}