feat: add methods information from standard library, improve generics…

… and varargs restore (#836)
skylot · Feb 16, 2020 · dea7714 · dea7714
1 parent 74b88b4
commit dea7714
Show file tree

Hide file tree

Showing 75 changed files with 2,169 additions and 1,016 deletions.
diff --git a/jadx-core/clsp-data/android-29-clst.jar b/jadx-core/clsp-data/android-29-clst.jar
diff --git a/jadx-core/src/main/java/jadx/api/JadxArgs.java b/jadx-core/src/main/java/jadx/api/JadxArgs.java
@@ -327,6 +327,14 @@ private void updateRenameFlag(boolean enabled, RenameEnum flag) {
 		}
 	}
 
+	public void setRenameFlags(Set<RenameEnum> renameFlags) {
+		this.renameFlags = renameFlags;
+	}
+
+	public Set<RenameEnum> getRenameFlags() {
+		return renameFlags;
+	}
+
 	public OutputFormatEnum getOutputFormat() {
 		return outputFormat;
 	}

diff --git a/jadx-core/src/main/java/jadx/api/JavaMethod.java b/jadx-core/src/main/java/jadx/api/JavaMethod.java
@@ -47,18 +47,12 @@ public List<ArgType> getArguments() {
 			return Collections.emptyList();
 		}
 		List<ArgType> arguments = mth.getArgTypes();
-		if (arguments == null) {
-			arguments = infoArgTypes;
-		}
 		return Utils.collectionMap(arguments,
 				type -> ArgType.tryToResolveClassAlias(mth.dex(), type));
 	}
 
 	public ArgType getReturnType() {
 		ArgType retType = mth.getReturnType();
-		if (retType == null) {
-			retType = mth.getMethodInfo().getReturnType();
-		}
 		return ArgType.tryToResolveClassAlias(mth.dex(), retType);
 	}
 

diff --git a/jadx-core/src/main/java/jadx/core/Jadx.java b/jadx-core/src/main/java/jadx/core/Jadx.java
@@ -11,6 +11,7 @@
 import org.slf4j.LoggerFactory;
 
 import jadx.api.JadxArgs;
+import jadx.core.dex.visitors.AttachMethodDetails;
 import jadx.core.dex.visitors.ClassModifier;
 import jadx.core.dex.visitors.ConstInlineVisitor;
 import jadx.core.dex.visitors.ConstructorVisitor;
@@ -25,6 +26,7 @@
 import jadx.core.dex.visitors.InitCodeVariables;
 import jadx.core.dex.visitors.MarkFinallyVisitor;
 import jadx.core.dex.visitors.MethodInlineVisitor;
+import jadx.core.dex.visitors.MethodInvokeVisitor;
 import jadx.core.dex.visitors.ModVisitor;
 import jadx.core.dex.visitors.PrepareForCodeGen;
 import jadx.core.dex.visitors.ProcessAnonymous;
@@ -83,6 +85,7 @@ public static List<IDexTreeVisitor> getPassesList(JadxArgs args) {
 			passes.add(new InitCodeVariables());
 			passes.add(new MarkFinallyVisitor());
 			passes.add(new ConstInlineVisitor());
+			passes.add(new AttachMethodDetails());
 			passes.add(new TypeInferenceVisitor());
 			if (args.isDebugInfo()) {
 				passes.add(new DebugInfoApplyVisitor());
@@ -102,6 +105,7 @@ public static List<IDexTreeVisitor> getPassesList(JadxArgs args) {
 			passes.add(new CleanRegions());
 
 			passes.add(new CodeShrinkVisitor());
+			passes.add(new MethodInvokeVisitor());
 			passes.add(new SimplifyVisitor());
 			passes.add(new CheckRegions());