diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index cf5df4ed18..8d94fa001f 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -31,7 +31,9 @@ import org.mozilla.fenix.library.bookmarks.BookmarkFragmentDirections
import org.mozilla.fenix.library.bookmarks.selectfolder.SelectBookmarkFolderFragmentDirections
import org.mozilla.fenix.library.history.HistoryFragmentDirections
import org.mozilla.fenix.search.SearchFragmentDirections
+import org.mozilla.fenix.settings.PairFragmentDirections
import org.mozilla.fenix.settings.SettingsFragmentDirections
+import org.mozilla.fenix.settings.TurnOnSyncFragmentDirections
import org.mozilla.fenix.utils.Settings
@SuppressWarnings("TooManyFunctions")
@@ -176,6 +178,10 @@ open class HomeActivity : AppCompatActivity() {
.actionBookmarkSelectFolderFragmentToBrowserFragment(customTabSessionId)
BrowserDirection.FromHistory ->
HistoryFragmentDirections.actionHistoryFragmentToBrowserFragment(customTabSessionId)
+ BrowserDirection.FromPair -> PairFragmentDirections.actionPairFragmentToBrowserFragment(customTabSessionId)
+ BrowserDirection.FromTurnOnSync -> TurnOnSyncFragmentDirections.actionTurnOnSyncFragmentToBrowserFragment(
+ customTabSessionId
+ )
}
if (sessionObserver == null)
sessionObserver = subscribeToSessions()
@@ -263,5 +269,6 @@ open class HomeActivity : AppCompatActivity() {
}
enum class BrowserDirection {
- FromGlobal, FromHome, FromSearch, FromSettings, FromBookmarks, FromBookmarksFolderSelect, FromHistory
+ FromGlobal, FromHome, FromSearch, FromSettings, FromBookmarks,
+ FromBookmarksFolderSelect, FromHistory, FromPair, FromTurnOnSync
}
diff --git a/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt
index 19d5785e7d..53db3277f6 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt
@@ -43,9 +43,7 @@ class PairFragment : Fragment(), BackHandler {
},
onScanResult = { pairingUrl ->
requireComponents.services.accountsAuthFeature.beginPairingAuthentication(pairingUrl)
- view?.let {
- (activity as HomeActivity).openToBrowser(BrowserDirection.FromSettings)
- }
+ (activity as HomeActivity).openToBrowser(BrowserDirection.FromPair)
}),
owner = this,
view = view
diff --git a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
index 75f36af10f..24fb0e4261 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
@@ -46,7 +46,7 @@ class TurnOnSyncFragment : PreferenceFragmentCompat() {
// We could auto-close this tab once we get to the end of the authentication process?
// Via an interceptor, perhaps.
view?.let {
- (activity as HomeActivity).openToBrowser(BrowserDirection.FromSettings)
+ (activity as HomeActivity).openToBrowser(BrowserDirection.FromTurnOnSync)
}
true
}
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index bd74df702b..ded8b5f341 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -304,7 +304,8 @@
+ app:popUpTo="@+id/settingsFragment"
+ app:popUpToInclusive="true" />
@@ -326,7 +327,8 @@
+ app:popUpTo="@+id/settingsFragment"
+ app:popUpToInclusive="true" />