For #10408: Check current destination before navigating.
parent
9fd835de0f
commit
9177871edc
|
@ -35,6 +35,7 @@ import org.mozilla.fenix.components.TabCollectionStorage
|
||||||
import org.mozilla.fenix.components.metrics.Event
|
import org.mozilla.fenix.components.metrics.Event
|
||||||
import org.mozilla.fenix.ext.components
|
import org.mozilla.fenix.ext.components
|
||||||
import org.mozilla.fenix.ext.nav
|
import org.mozilla.fenix.ext.nav
|
||||||
|
import org.mozilla.fenix.ext.navigateSafe
|
||||||
import org.mozilla.fenix.ext.requireComponents
|
import org.mozilla.fenix.ext.requireComponents
|
||||||
import org.mozilla.fenix.ext.settings
|
import org.mozilla.fenix.ext.settings
|
||||||
import org.mozilla.fenix.shortcut.FirstTimePwaObserver
|
import org.mozilla.fenix.shortcut.FirstTimePwaObserver
|
||||||
|
@ -181,6 +182,8 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun navToTrackingProtectionPanel(session: Session) {
|
override fun navToTrackingProtectionPanel(session: Session) {
|
||||||
|
val navController = findNavController()
|
||||||
|
|
||||||
val useCase = TrackingProtectionUseCases(
|
val useCase = TrackingProtectionUseCases(
|
||||||
sessionManager = requireComponents.core.sessionManager,
|
sessionManager = requireComponents.core.sessionManager,
|
||||||
engine = requireComponents.core.engine
|
engine = requireComponents.core.engine
|
||||||
|
@ -194,7 +197,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
|
||||||
trackingProtectionEnabled = isEnabled,
|
trackingProtectionEnabled = isEnabled,
|
||||||
gravity = getAppropriateLayoutGravity()
|
gravity = getAppropriateLayoutGravity()
|
||||||
)
|
)
|
||||||
nav(R.id.browserFragment, directions)
|
navController.navigateSafe(R.id.browserFragment, directions)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,7 @@ import org.mozilla.fenix.components.metrics.Event
|
||||||
import org.mozilla.fenix.ext.components
|
import org.mozilla.fenix.ext.components
|
||||||
import org.mozilla.fenix.ext.getRootView
|
import org.mozilla.fenix.ext.getRootView
|
||||||
import org.mozilla.fenix.ext.nav
|
import org.mozilla.fenix.ext.nav
|
||||||
|
import org.mozilla.fenix.ext.navigateSafe
|
||||||
import org.mozilla.fenix.ext.settings
|
import org.mozilla.fenix.ext.settings
|
||||||
import org.mozilla.fenix.home.SharedViewModel
|
import org.mozilla.fenix.home.SharedViewModel
|
||||||
import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
|
import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
|
||||||
|
@ -190,7 +191,7 @@ class DefaultBrowserToolbarController(
|
||||||
} else {
|
} else {
|
||||||
val directions =
|
val directions =
|
||||||
BrowserFragmentDirections.actionBrowserFragmentToCreateShortcutFragment()
|
BrowserFragmentDirections.actionBrowserFragmentToCreateShortcutFragment()
|
||||||
navController.navigate(directions)
|
navController.navigateSafe(R.id.browserFragment, directions)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue