fix: don't add @OverRide if super method is private (#976)

skylot · Sep 17, 2020 · cfaa6ab · cfaa6ab
1 parent 91ee756
commit cfaa6ab
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/OverrideMethodVisitor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/OverrideMethodVisitor.java
@@ -53,9 +53,11 @@ private List<IMethodDetails> collectOverrideMethods(RootNode root, List<ArgType>
 			ClassNode classNode = root.resolveClass(superType);
 			if (classNode != null) {
 				for (MethodNode mth : classNode.getMethods()) {
-					String mthShortId = mth.getMethodInfo().getShortId();
-					if (mthShortId.startsWith(signature)) {
-						overrideList.add(mth);
+					if (!mth.getAccessFlags().isPrivate()) {
+						String mthShortId = mth.getMethodInfo().getShortId();
+						if (mthShortId.startsWith(signature)) {
+							overrideList.add(mth);
+						}
 					}
 				}
 			} else {

diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestOverridePrivateMethod.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestOverridePrivateMethod.java
@@ -0,0 +1,29 @@
+package jadx.tests.integration.others;
+
+import org.junit.jupiter.api.Test;
+
+import jadx.tests.api.IntegrationTest;
+
+import static jadx.tests.api.utils.assertj.JadxAssertions.assertThat;
+
+public class TestOverridePrivateMethod extends IntegrationTest {
+
+	public static class TestCls {
+		public static class BaseClass {
+			private void a() {
+			}
+		}
+
+		public static class MyClass extends BaseClass {
+			public void a() {
+			}
+		}
+	}
+
+	@Test
+	public void test() {
+		assertThat(getClassNode(TestCls.class))
+				.code()
+				.doesNotContain("@Override");
+	}
+}