blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #10408: Check current destination before navigating.

master
mcarare 2020-05-05 10:51:13 +03:00 committed by Mihai Adrian
parent 9fd835de0f
commit 9177871edc
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -35,6 +35,7 @@ import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.ext.navigateSafe
import org.mozilla.fenix.ext.requireComponents
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.shortcut.FirstTimePwaObserver
@ -181,6 +182,8 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
}
override fun navToTrackingProtectionPanel(session: Session) {
val navController = findNavController()
val useCase = TrackingProtectionUseCases(
sessionManager = requireComponents.core.sessionManager,
engine = requireComponents.core.engine
@ -194,7 +197,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
trackingProtectionEnabled = isEnabled,
gravity = getAppropriateLayoutGravity()
)
nav(R.id.browserFragment, directions)
navController.navigateSafe(R.id.browserFragment, directions)
}
}

3
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
View File

@ -38,6 +38,7 @@ import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.getRootView
import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.ext.navigateSafe
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.home.SharedViewModel
import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
@ -190,7 +191,7 @@ class DefaultBrowserToolbarController(
} else {
val directions =
BrowserFragmentDirections.actionBrowserFragmentToCreateShortcutFragment()
navController.navigate(directions)
navController.navigateSafe(R.id.browserFragment, directions)
}
}
}