diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java b/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java index 4790e0586..06e98902e 100644 --- a/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java +++ b/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java @@ -253,7 +253,7 @@ public class MethodNode extends NotificationAttrNode implements IMethodDetails, return mthInfo.getReturnType().equals(ArgType.VOID); } - public List collectArgsWithoutLoading() { + public List collectArgNodes() { ICodeInfo codeInfo = getTopParentClass().getCode(); int mthDefPos = getDefPosition(); int lineEndPos = CodeUtils.getLineEndForPos(codeInfo.getCodeStr(), mthDefPos); diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/FridaAction.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/FridaAction.java index 05f4b7f30..8ae55fb9c 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/codearea/FridaAction.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/codearea/FridaAction.java @@ -85,7 +85,7 @@ public final class FridaAction extends JNodeAction { } else { overload = ""; } - List argNames = mth.collectArgsWithoutLoading().stream() + List argNames = mth.collectArgNodes().stream() .map(VarNode::getName).collect(Collectors.toList()); String args = String.join(", ", argNames); String logArgs; diff --git a/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/save/MappingExporter.java b/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/save/MappingExporter.java index a7671f347..e10ba23f1 100644 --- a/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/save/MappingExporter.java +++ b/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/save/MappingExporter.java @@ -213,7 +213,7 @@ public class MappingExporter { } // Method args int lvtIndex = mth.getAccessFlags().isStatic() ? 0 : 1; - List args = mth.collectArgsWithoutLoading(); + List args = mth.collectArgNodes(); for (VarNode arg : args) { Integer lvIndex = DalvikToJavaBytecodeUtils.getMethodArgLvIndex(arg); if (lvIndex == null) { diff --git a/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/utils/DalvikToJavaBytecodeUtils.java b/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/utils/DalvikToJavaBytecodeUtils.java index 4eabc9f81..98061eba8 100644 --- a/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/utils/DalvikToJavaBytecodeUtils.java +++ b/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/utils/DalvikToJavaBytecodeUtils.java @@ -22,7 +22,7 @@ public class DalvikToJavaBytecodeUtils { if (lvIndex != null) { return lvIndex; } - List args = mth.collectArgsWithoutLoading(); + List args = mth.collectArgNodes(); for (VarNode arg : args) { lvIndex = arg.getReg() - args.get(0).getReg() + (mth.getAccessFlags().isStatic() ? 0 : 1); if (arg.equals(methodArg)) { @@ -53,7 +53,7 @@ public class DalvikToJavaBytecodeUtils { return lvIndex; } Integer lastArgLvIndex = mth.getAccessFlags().isStatic() ? -1 : 0; - List args = mth.collectArgsWithoutLoading(); + List args = mth.collectArgNodes(); if (!args.isEmpty()) { lastArgLvIndex = getMethodArgLvIndex(args.get(args.size() - 1)); } @@ -86,7 +86,7 @@ public class DalvikToJavaBytecodeUtils { public static Integer getMethodArgLvtIndex(VarNode methodArg) { MethodNode mth = methodArg.getMth(); int lvtIndex = mth.getAccessFlags().isStatic() ? 0 : 1; - List args = mth.collectArgsWithoutLoading(); + List args = mth.collectArgNodes(); for (VarNode arg : args) { if (arg.equals(methodArg)) { return lvtIndex; diff --git a/jadx-plugins/jadx-script/examples/scripts/gui/custom_frida.jadx.kts b/jadx-plugins/jadx-script/examples/scripts/gui/custom_frida.jadx.kts index 5c575567b..14aecb43a 100644 --- a/jadx-plugins/jadx-script/examples/scripts/gui/custom_frida.jadx.kts +++ b/jadx-plugins/jadx-script/examples/scripts/gui/custom_frida.jadx.kts @@ -60,7 +60,7 @@ fun generateMethodSnippet(mthNode: MethodNode): String { "" } val shortClassName = mthNode.parentClass.name - val argNames = mthNode.collectArgsWithoutLoading().map { a -> a.name } + val argNames = mthNode.collectArgNodes().map { a -> a.name } val args = argNames.joinToString(separator = ", ") val logArgs = if (argNames.isNotEmpty()) { argNames.joinToString(separator = " + ', ' + ", prefix = " + ', ' + ") { p -> "'$p: ' + $p" }