Internal refactoring

RELNOTES=n/a PiperOrigin-RevId: 360256525
google · Mar 1, 2021 · 2192014 · 2192014
1 parent f39bc87
commit 2192014
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/java/dagger/hilt/android/internal/managers/ActivityRetainedComponentManager.java b/java/dagger/hilt/android/internal/managers/ActivityRetainedComponentManager.java
@@ -18,6 +18,8 @@
 
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.lifecycle.ViewModelStoreOwner;
+import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.activity.ComponentActivity;
@@ -82,23 +84,26 @@ protected void onCleared() {
   private final Object componentLock = new Object();
 
   ActivityRetainedComponentManager(ComponentActivity activity) {
-    this.viewModelProvider =
-        new ViewModelProvider(
-            activity,
-            new ViewModelProvider.Factory() {
-              @NonNull
-              @Override
-              @SuppressWarnings("unchecked")
-              public <T extends ViewModel> T create(@NonNull Class<T> aClass) {
-                ActivityRetainedComponent component =
-                    EntryPoints.get(
-                            activity.getApplication(),
-                            ActivityRetainedComponentBuilderEntryPoint.class)
-                        .retainedComponentBuilder()
-                        .build();
-                return (T) new ActivityRetainedComponentViewModel(component);
-              }
-            });
+    this.viewModelProvider = getViewModelProvider(activity, activity.getApplication());
+  }
+
+  private ViewModelProvider getViewModelProvider(
+      ViewModelStoreOwner owner, Context applicationContext) {
+    return new ViewModelProvider(
+        owner,
+        new ViewModelProvider.Factory() {
+          @NonNull
+          @Override
+          @SuppressWarnings("unchecked")
+          public <T extends ViewModel> T create(@NonNull Class<T> aClass) {
+            ActivityRetainedComponent component =
+                EntryPoints.get(
+                        applicationContext, ActivityRetainedComponentBuilderEntryPoint.class)
+                    .retainedComponentBuilder()
+                    .build();
+            return (T) new ActivityRetainedComponentViewModel(component);
+          }
+        });
   }
 
   @Override

diff --git a/javatests/dagger/hilt/processor/internal/root/RootFileFormatterTest.java b/javatests/dagger/hilt/processor/internal/root/RootFileFormatterTest.java
@@ -57,8 +57,8 @@ public void testProdComponents() {
         .contains(
             JOINER.join(
                 "  public abstract static class SingletonC implements"
-                    + " HiltWrapper_ActivityRetainedComponentManager"
-                    + "_ActivityRetainedComponentBuilderEntryPoint,",
+                + " HiltWrapper_ActivityRetainedComponentManager"
+                + "_ActivityRetainedComponentBuilderEntryPoint,",
                 "      ServiceComponentManager.ServiceComponentBuilderEntryPoint,",
                 "      SingletonComponent,",
                 "      GeneratedComponent,",
@@ -103,8 +103,8 @@ public void testTestComponents() {
         .contains(
             JOINER.join(
                 "  public abstract static class SingletonC implements"
-                    + " HiltWrapper_ActivityRetainedComponentManager"
-                    + "_ActivityRetainedComponentBuilderEntryPoint,",
+                + " HiltWrapper_ActivityRetainedComponentManager"
+                + "_ActivityRetainedComponentBuilderEntryPoint,",
                 "      ServiceComponentManager.ServiceComponentBuilderEntryPoint,",
                 "      SingletonComponent,",
                 "      TestSingletonComponent,",