Improve jadx #1221

MrIkso · 2021-08-03T13:39:20Z

My changes on this project:

fixed [core]Line number rendering problem #1153, commit from 4732fa3 dont fix this bug correctly
fixed Issues with resource on latest build[core] #1060, styles might contain dots in name
fixed skiping only file based resources type. jadx created empty animators.xml ect. It doesn't make sense, because there contains only paths to xml files.
code refactored in gui project module
use lowercase name on deobfuscated\renamed resources names and id in hexdecimal
update all icon to svg format. Used from Intellij Icons. License Apache 2.0, i think there should be no problems

Screenshot

…and id in hex format

skylot

Changes like code formatting are necessary for passing build for this PR.
Although, I can fix these issues for you if you have any trouble.

skylot · 2021-08-03T15:53:49Z

jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java

-		lineNumbers = new LineNumbers(codeArea);
+	/*	lineNumbers = new LineNumbers(codeArea);
 		lineNumbers.setUseSourceLines(useSourceLines);
-		codeScrollPane.setRowHeaderView(lineNumbers);
+		codeScrollPane.setRowHeaderView(lineNumbers);*/


Commenting code is not a fix, you just disable important feature (debug line number) instead fixing.

I'll see what exactly it does, I didn't delete it on purpose because I wasn't sure.

I returned everything back, I thought it was a bug), and this is a feature, and fixed it so that it could only be worked on in decompiled java code, xml file not contains source lines.

xml file not contains source lines

Actually, AndroidManifest.xml have source lines sometimes. And there is no point in your new changes, please revert them too.

AndroidManifest.xml have source lines sometimes

As far as I know, I have never seen them there, it is also turned on by default and I personally do not like it. It can even be rendered into a separate option. This function only bothers me.

Ok, I see, I can add such option. Just don't disable feature you don't like 😄

skylot · 2021-08-03T15:56:26Z

jadx-gui/src/main/java/jadx/gui/ui/codearea/SearchBar.java

@@ -158,20 +158,20 @@ private void search(int direction) {
 			} catch (BadLocationException e) {
 				LOG.error("Caret move error", e);
 			}
-		}
+		}*/


Same here, commenting code is not a fix. If you don't know how to fix this, please open new issue with detail description.

This removes those crutches) from changing the background in the input field. In general, this needs to be rewritten so that it shows which position we are in from the found, like ide search bar.

skylot · 2021-08-03T15:57:22Z

jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java

@@ -119,7 +122,7 @@ private void enableSwitchingTabs() {
 				lastTab = null;
 				return;
 			}
-			FocusManager.focusOnCodePanel(tab);
+		//	FocusManager.focusOnCodePanel(tab);


Another code commenting. And I don't see any relation to your changes.

But this caused a not very pleasant effect when every time a new class is opened when use new themes. Related to improving the ui.

skylot · 2021-08-03T15:58:40Z

jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportNode.java

@@ -29,7 +29,7 @@

 	private static final Gson GSON = new GsonBuilder().create();

-	private static final ImageIcon ICON = UiUtils.openIcon("icon_quark");
+	private static final ImageIcon ICON = UiUtils.openSvgIcon("ui/analyze");


We need to find SVG icon for official Quark icon.

Quark have icon? I don't see it on official repo.

I mean, one on their group logo like it was before.
But I am also unable to find SVG version. So maybe leave PNG version, it looks ok as icon, I think.

Generated from png logo. Seems to be fine
icon.zip
upaded variant
quark_icon.zip

skylot · 2021-08-03T16:01:49Z

jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java

 import jadx.gui.ui.TabbedPane;
 import jadx.gui.ui.codearea.ClassCodeContentPanel;
 import jadx.gui.utils.OverlayIcon;
 import jadx.gui.utils.UiUtils;
+import sun.security.mscapi.PRNG;


Unused import which leads to compilation error.
Please format code before pushing PR, see Code Formatting

I looked at this, the format of the code in this configuration does not work correctly in my IDEA (2021.2) Windows system. I do not know what to do...

Just execute gradle spotlessApply.

the format of the code in this configuration does not work correctly in my IDEA

What kind of issue you have?

jadx-gui/src/main/java/jadx/gui/utils/UiUtils.java

skylot · 2021-08-03T16:17:30Z

@jpstotz, @lbj-the-goat can anyone check or review changes to resources processing?

jpstotz · 2021-08-03T17:55:26Z

@skylot I just checked the commit "fix(res): use lowercase name on deobfuscated\renamed resources names and id in hex format" 6f367d5 except for the code formatting it sounds reasonable to harmonize the resource id to format 0x%08x.

For commit 6bfe4f2 which adds more types to SKIP_RES_TYPES I have to admit that I am not aware why there is such an exclude list and what effects this list has.

MrIkso · 2021-08-03T21:20:17Z

commit 6bfe4f2 which adds more types to SKIP_RES_TYPES I have to admit that I am not aware why there is such an exclude list and what effects this list has.

see this or see dumped arsc file using aapt\aapt2 or see file on raw format, or use ApkAnalyser from Android Studio to see arsc file. I watched everything for a long time. Those resources are resource types that in the list SKIP_RES_TYPES contain only paths to files, there are no more values there (except for the id type)

busmaker · 2021-08-04T03:31:32Z

@jpstotz, @lbj-the-goat can anyone check or review changes to resources processing?

Hello, Unfortunately I am not familiar with resource formats.😁

skylot · 2021-08-04T18:40:29Z

@MrIkso I merged this PR with following fixing commits. I revert some changes as I requested above.
For line numbers option, I open a new issue: #1223.
Also, I applied your SVG icon for Quark in 667cae2.
If you have any suggestion, you can open new issue or PR.
And thank you for your work! 🎉

MrIkso · 2021-08-04T18:51:50Z

@skylot ok, thanks. I still have ideas, upate the search on code and try to close #1212 and #1210 and possibly fix some other problems. With decompilation of java code I cannot help, I don’t understand it... But I will already do this in a new branch and will try to do it not so dirty.

MrIkso added 4 commits August 3, 2021 15:01

fix(xml): add more file based resources type to skip

6bfe4f2

fix(res): fix #1060, styles might contain dots in name

15afb44

fix(res): use lowercase name on deobfuscated\renamed resources names …

6f367d5

…and id in hex format

feat(gui): update gui under FlatLaf

1b7709a

skylot requested changes Aug 3, 2021

View reviewed changes

MrIkso added 2 commits August 3, 2021 23:54

fix(gui): use FlatSVGIcon to fix icons brightness difference

bd6e63a

fix(gui): use source lines only decompiled java code

2e3a68a

skylot merged commit ee12f0b into skylot:master Aug 4, 2021

anantshri mentioned this pull request Nov 20, 2021

New: Release notes from jadx: 1.3.0 TamerPlatform/Tools_Repository#703

Closed

jpstotz mentioned this pull request Jul 24, 2022

Error decompiling resources in obfuscated APKs[core] #1581

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve jadx #1221

Improve jadx #1221

MrIkso commented Aug 3, 2021

skylot left a comment

skylot Aug 3, 2021

MrIkso Aug 3, 2021

MrIkso Aug 3, 2021

skylot Aug 3, 2021

MrIkso Aug 3, 2021

skylot Aug 3, 2021

skylot Aug 3, 2021

MrIkso Aug 3, 2021

skylot Aug 3, 2021

MrIkso Aug 3, 2021

skylot Aug 3, 2021

MrIkso Aug 3, 2021

skylot Aug 3, 2021

MrIkso Aug 3, 2021 •

edited

Loading

skylot Aug 3, 2021

MrIkso Aug 3, 2021

skylot Aug 3, 2021

skylot commented Aug 3, 2021

jpstotz commented Aug 3, 2021

MrIkso commented Aug 3, 2021

busmaker commented Aug 4, 2021 •

edited

Loading

skylot commented Aug 4, 2021

MrIkso commented Aug 4, 2021

Improve jadx #1221

Improve jadx #1221

Conversation

MrIkso commented Aug 3, 2021

Screenshot

skylot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MrIkso Aug 3, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

skylot commented Aug 3, 2021

jpstotz commented Aug 3, 2021

MrIkso commented Aug 3, 2021

busmaker commented Aug 4, 2021 • edited Loading

skylot commented Aug 4, 2021

MrIkso commented Aug 4, 2021

MrIkso Aug 3, 2021 •

edited

Loading

busmaker commented Aug 4, 2021 •

edited

Loading