diff --git a/app/src/main/java/org/mozilla/fenix/BrowsingModeManager.kt b/app/src/main/java/org/mozilla/fenix/BrowsingModeManager.kt index 953e956bb..bc51042f7 100644 --- a/app/src/main/java/org/mozilla/fenix/BrowsingModeManager.kt +++ b/app/src/main/java/org/mozilla/fenix/BrowsingModeManager.kt @@ -15,7 +15,6 @@ interface BrowsingModeManager { val isPrivate: Boolean var mode: Mode - } interface BrowserModeStorage { @@ -35,7 +34,6 @@ fun Settings.createBrowserModeStorage(): BrowserModeStorage = object : BrowserMo override fun setMode(mode: BrowsingModeManager.Mode) { this@createBrowserModeStorage.setPrivateMode(mode == BrowsingModeManager.Mode.Private) } - } class DefaultBrowsingModeManager( diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index c82083936..38fb89f66 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -47,7 +47,6 @@ open class HomeActivity : AppCompatActivity() { lateinit var themeManager: ThemeManager - private val navHost by lazy { supportFragmentManager.findFragmentById(R.id.container) as NavHostFragment } @@ -258,20 +257,26 @@ open class HomeActivity : AppCompatActivity() { } private fun createBrowsingModeManager(): BrowsingModeManager { - return if (isCustomTab) CustomTabBrowsingModeManager() - else DefaultBrowsingModeManager(Settings.getInstance(this).createBrowserModeStorage()) { - themeManager.setTheme(when (it.isPrivate()) { - true -> ThemeManager.Theme.Private - false -> ThemeManager.Theme.Normal - }) + return if (isCustomTab) { + CustomTabBrowsingModeManager() + } else { + DefaultBrowsingModeManager(Settings.getInstance(this).createBrowserModeStorage()) { + themeManager.setTheme(when (it.isPrivate()) { + true -> ThemeManager.Theme.Private + false -> ThemeManager.Theme.Normal + }) + } } } private fun createThemeManager(currentTheme: ThemeManager.Theme): ThemeManager { - return if (isCustomTab) CustomTabThemeManager() - else DefaultThemeManager(currentTheme) { - setTheme(it) - recreate() + return if (isCustomTab) { + CustomTabThemeManager() + } else { + DefaultThemeManager(currentTheme) { + setTheme(it) + recreate() + } } }