From b1cc487f14953b130716af19a70d52b0ed37e3e5 Mon Sep 17 00:00:00 2001 From: Colin Lee Date: Thu, 18 Apr 2019 23:57:58 -0500 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/1596: Bookmarks get the last used folder as parent --- .../org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt index 762f9e4b62..2ddb10e7da 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt @@ -24,6 +24,7 @@ import androidx.appcompat.widget.ActionMenuView import androidx.appcompat.widget.Toolbar import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProviders import androidx.navigation.Navigation import kotlinx.android.synthetic.main.fragment_bookmark.view.* import kotlinx.coroutines.CoroutineScope @@ -92,6 +93,10 @@ class BookmarkFragment : Fragment(), CoroutineScope, BackHandler, AccountObserve launch(Main) { if (currentGuid != BookmarkRoot.Root.id) (activity as HomeActivity).title = currentRoot!!.title getManagedEmitter().onNext(BookmarkChange.Change(currentRoot!!)) + + activity?.run { + ViewModelProviders.of(this).get(BookmarksSharedViewModel::class.java) + }!!.selectedFolder = null } } }