From 28ecf241f50cad972fd1e10ff0db3b8f3fde2e79 Mon Sep 17 00:00:00 2001 From: Colin Lee Date: Thu, 6 Jun 2019 14:16:31 -0500 Subject: [PATCH] For #1301: Always observe sessions to keep uri_count (#3172) --- app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index 3ae991901..a89f3cf9c 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -179,6 +179,9 @@ open class HomeActivity : AppCompatActivity() { @Suppress("ComplexMethod") fun openToBrowser(from: BrowserDirection, customTabSessionId: String? = null) { + if (sessionObserver == null) + sessionObserver = subscribeToSessions() + if (navHost.navController.currentDestination?.id == R.id.browserFragment) return val directions = if (!navHost.navController.popBackStack(R.id.browserFragment, false)) { when (from) { @@ -207,9 +210,6 @@ open class HomeActivity : AppCompatActivity() { null } - if (sessionObserver == null) - sessionObserver = subscribeToSessions() - directions?.let { navHost.navController.navigate(it) }