Fix incorrect dagger injection of HomeViewModel in TabTrayFragment

mozilla-mobile · Apr 30, 2020 · f2337d5 · f2337d5
1 parent 308e8a7
commit f2337d5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/app/src/main/java/org/mozilla/focus/tabs/tabtray/TabTrayFragment.java b/app/src/main/java/org/mozilla/focus/tabs/tabtray/TabTrayFragment.java
@@ -54,6 +54,8 @@
 import org.mozilla.focus.telemetry.TelemetryWrapper;
 import org.mozilla.focus.utils.Settings;
 import org.mozilla.focus.utils.ViewUtils;
+import org.mozilla.rocket.content.BaseViewModelFactory;
+import org.mozilla.rocket.content.ExtentionKt;
 import org.mozilla.rocket.home.HomeViewModel;
 import org.mozilla.rocket.nightmode.themed.ThemedImageView;
 import org.mozilla.rocket.nightmode.themed.ThemedRecyclerView;
@@ -68,6 +70,10 @@
 
 import java.util.List;
 
+import javax.inject.Inject;
+
+import dagger.Lazy;
+
 public class TabTrayFragment extends DialogFragment implements TabTrayContract.View,
         View.OnClickListener, TabTrayAdapter.TabClickListener {
 
@@ -107,6 +113,8 @@ public class TabTrayFragment extends DialogFragment implements TabTrayContract.V
     private Runnable dismissRunnable = this::dismissAllowingStateLoss;
 
     private TabTrayViewModel tabTrayViewModel = null;
+    @Inject
+    Lazy<HomeViewModel> homeViewModelCreator;
     private HomeViewModel homeViewModel = null;
 
     private ThemedImageView imgPrivateBrowsing, imgNewTab;
@@ -124,6 +132,7 @@ public static TabTrayFragment newInstance() {
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
+        ExtentionKt.appComponent(this).inject(this);
         super.onCreate(savedInstanceState);
         setStyle(DialogFragment.STYLE_NO_TITLE, R.style.TabTrayTheme);
 
@@ -192,7 +201,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                 adapter.setShoppingSearch(showShoppingSearch, uiModel.getKeyword());
             }
         });
-        homeViewModel = new ViewModelProvider(getActivity(), new ViewModelProvider.NewInstanceFactory()).get(HomeViewModel.class);
+        homeViewModel = new ViewModelProvider(requireActivity(), new BaseViewModelFactory<>(homeViewModelCreator::get)).get(HomeViewModel.class);
         backgroundView = view.findViewById(R.id.root_layout);
         logoMan = backgroundView.findViewById(R.id.logo_man);
         imgPrivateBrowsing = view.findViewById(R.id.img_private_browsing);

diff --git a/app/src/main/java/org/mozilla/rocket/di/AppComponent.kt b/app/src/main/java/org/mozilla/rocket/di/AppComponent.kt
@@ -27,6 +27,7 @@ import org.mozilla.focus.fragment.DownloadsFragment
 import org.mozilla.focus.history.BrowsingHistoryFragment
 import org.mozilla.focus.persistence.TabsDatabase
 import org.mozilla.focus.persistence.di.TabsModule
+import org.mozilla.focus.tabs.tabtray.TabTrayFragment
 import org.mozilla.focus.urlinput.UrlInputFragment
 import org.mozilla.rocket.chrome.ChromeViewModel
 import org.mozilla.rocket.chrome.di.ChromeModule
@@ -107,6 +108,7 @@ interface AppComponent {
     fun inject(browserFragment: org.mozilla.rocket.privately.browse.BrowserFragment)
     fun inject(downloadsFragment: DownloadsFragment)
     fun inject(homeFragment: HomeFragment)
+    fun inject(tabTrayFragment: TabTrayFragment)
     fun inject(privateHomeFragment: PrivateHomeFragment)
     fun inject(urlInputFragment: UrlInputFragment)
     fun inject(menuDialog: MenuDialog)