fix: better package-info support

skylot · Dec 14, 2024 · 560a615 · 560a615
1 parent 17695ba
commit 560a615
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java b/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
@@ -176,8 +176,7 @@ public void updateGenericClsData(List<ArgType> generics, ArgType superClass, Lis
 
 	private static void processSpecialClasses(ClassNode cls) {
 		AccessInfo flags = cls.getAccessFlags();
-		if (flags.isSynthetic() && flags.isInterface() && flags.isAbstract()
-				&& cls.getName().equals("package-info")) {
+		if (flags.isInterface() && cls.getName().equals("package-info")) {
 			cls.add(AFlag.PACKAGE_INFO);
 			cls.add(AFlag.DONT_RENAME);
 		}

diff --git a/jadx-core/src/test/java/jadx/tests/integration/special/TestPackageInfoSupport.java b/jadx-core/src/test/java/jadx/tests/integration/special/TestPackageInfoSupport.java
@@ -28,5 +28,7 @@ public void test() {
 						"package special.pkg2;",
 						"",
 						"import org.jetbrains.annotations.ApiStatus;");
+		assertThat(searchCls(classes, "special.pkg3.package-info"))
+				.code().isEqualTo("\npackage special.pkg3;\n");
 	}
 }
diff --git a/jadx-core/src/test/smali/special/TestPackageInfoSupport/pkg3.smali b/jadx-core/src/test/smali/special/TestPackageInfoSupport/pkg3.smali
@@ -0,0 +1,2 @@
+.class interface Lspecial/pkg3/package-info;
+.super Ljava/lang/Object;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		.class interface Lspecial/pkg3/package-info;
		.super Ljava/lang/Object;