Fixed: Resolved the issue where Xposed code generation was incorrect …

…when dealing with generic parameters and alias fields.
skylot · Dec 11, 2023 · 6e99268 · 6e99268
1 parent ddb5aab
commit 6e99268
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/XposedAction.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/XposedAction.java
@@ -101,11 +101,20 @@ private String generateMethodSnippet(JMethod jMth) {
 			return String.format(xposedFormatStr, xposedMethod, rawClassName, methodName);
 		}
 		String params = mthArgs.stream()
-				.map(type -> (type.isGeneric() ? type.getObject() : type) + ".class, ")
+				.map(type -> fixTypeContent(type) + ".class, ")
 				.collect(Collectors.joining());
 		return String.format(xposedFormatStr, xposedMethod, rawClassName, methodName + params);
 	}
 
+	private String fixTypeContent(ArgType type) {
+		if (type.isGeneric()) {
+			return type.getObject();
+		} else if (type.isGenericType() && type.isObject() && type.isTypeKnown()) {
+			return "Object";
+		}
+		return type.toString();
+	}
+
 	private String generateClassSnippet(JClass jc) {
 		JavaClass javaClass = jc.getCls();
 		String rawClassName = javaClass.getRawName();
@@ -120,6 +129,6 @@ private String generateFieldSnippet(JField jf) {
 		String isStatic = javaField.getAccessFlags().isStatic() ? "Static" : "";
 		String type = PRIMITIVE_TYPE_MAPPING.getOrDefault(javaField.getFieldNode().getType().toString(), "Object");
 		String xposedMethod = "XposedHelpers.get" + isStatic + type + "Field";
-		return String.format("%s(/*runtimeObject*/, \"%s\");", xposedMethod, javaField.getName());
+		return String.format("%s(/*runtimeObject*/, \"%s\");", xposedMethod, javaField.getFieldNode().getFieldInfo().getName());
 	}
 }