* Fixes https://github.com/mozilla-mobile/fenix/issues/4488
Updates changelog

* Removes wildcard imports.

* Removes custom label in use, replaces with let
pull/600/head
Suraj Shah 5 years ago committed by Jeff Boek
parent 5db6464268
commit bde36a6d45

@ -38,12 +38,15 @@ import mozilla.components.concept.storage.BookmarkNode
import mozilla.components.concept.storage.BookmarkNodeType import mozilla.components.concept.storage.BookmarkNodeType
import mozilla.components.support.ktx.android.view.hideKeyboard import mozilla.components.support.ktx.android.view.hideKeyboard
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.FenixSnackbar
import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.getColorFromAttr import org.mozilla.fenix.ext.getColorFromAttr
import org.mozilla.fenix.ext.nav import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.requireComponents
import org.mozilla.fenix.ext.setRootTitles import org.mozilla.fenix.ext.setRootTitles
import org.mozilla.fenix.ext.withRootTitle import org.mozilla.fenix.ext.withRootTitle
import org.mozilla.fenix.ext.getRootView
import org.mozilla.fenix.ext.urlToTrimmedHost
import org.mozilla.fenix.library.bookmarks.BookmarksSharedViewModel import org.mozilla.fenix.library.bookmarks.BookmarksSharedViewModel
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@ -175,8 +178,20 @@ class EditBookmarkFragment : Fragment() {
lifecycleScope.launch(IO) { lifecycleScope.launch(IO) {
requireComponents.core.bookmarksStorage.deleteNode(guidToEdit) requireComponents.core.bookmarksStorage.deleteNode(guidToEdit)
requireComponents.analytics.metrics.track(Event.RemoveBookmark) requireComponents.analytics.metrics.track(Event.RemoveBookmark)
launch(Main) { launch(Main) {
Navigation.findNavController(requireActivity(), R.id.container).popBackStack() Navigation.findNavController(requireActivity(), R.id.container).popBackStack()
activity.getRootView()?.let { rootView ->
bookmarkNode?.let {
FenixSnackbar.make(rootView, FenixSnackbar.LENGTH_SHORT)
.setText(
getString(R.string.bookmark_deletion_snackbar_message,
it.url?.urlToTrimmedHost(activity) ?: it.title
)
)
.show()
}
}
} }
} }
dialog.dismiss() dialog.dismiss()

Loading…
Cancel
Save