Rename init() method in generated Activity to avoid conflict with use…

…r method of same name. Fixes #2456 RELNOTES="Fix #2456: Rename init() method in generated Activity to avoid conflict with user method of same name." PiperOrigin-RevId: 361220626
google · Mar 5, 2021 · 1c66033 · 1c66033
1 parent 7e0abd6
commit 1c66033
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/java/dagger/hilt/android/processor/internal/androidentrypoint/ActivityGenerator.java b/java/dagger/hilt/android/processor/internal/androidentrypoint/ActivityGenerator.java
@@ -57,7 +57,9 @@ public void generate() throws IOException {
     Processors.addGeneratedAnnotation(builder, env, getClass());
 
       Generators.copyConstructors(
-          metadata.baseElement(), CodeBlock.builder().addStatement("init()").build(), builder);
+          metadata.baseElement(),
+          CodeBlock.builder().addStatement("_initHiltInternal()").build(),
+          builder);
       builder.addMethod(init());
 
     metadata.baseElement().getTypeParameters().stream()
@@ -88,7 +90,7 @@ public void generate() throws IOException {
   //   });
   // }
   private MethodSpec init() {
-    return MethodSpec.methodBuilder("init")
+    return MethodSpec.methodBuilder("_initHiltInternal")
         .addModifiers(Modifier.PRIVATE)
         .addStatement(
             "addOnContextAvailableListener($L)",

diff --git a/javatests/dagger/hilt/android/processor/internal/GeneratorsTest.java b/javatests/dagger/hilt/android/processor/internal/GeneratorsTest.java
@@ -79,7 +79,7 @@ public void copyConstructorParametersCopiesExternalNullables() {
                 "      @Nullable String androidxNullable,",
                 "      @javax.annotation.Nullable String javaxNullable) {",
                 "    super(supportNullable, androidxNullable, javaxNullable);",
-                "    init();",
+                "    _initHiltInternal();",
                 "  }",
                 "}"));
   }