blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #11625 - Fixes tab tray staying open when opening from another app (#11740)

master
Jeff Boek 2020-06-18 10:32:14 -07:00 committed by GitHub
parent e175283acb
commit 82cbafabaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/mozilla/fenix/HomeActivity.kt
View File

@ -84,6 +84,7 @@ import org.mozilla.fenix.settings.search.EditCustomSearchEngineFragmentDirection
import org.mozilla.fenix.share.AddNewDeviceFragmentDirections
import org.mozilla.fenix.sync.SyncedTabsFragmentDirections
import org.mozilla.fenix.tabtray.FenixTabsAdapter
import org.mozilla.fenix.tabtray.TabTrayDialogFragment
import org.mozilla.fenix.theme.DefaultThemeManager
import org.mozilla.fenix.theme.ThemeManager
import org.mozilla.fenix.utils.BrowsersCache
@ -216,8 +217,18 @@ open class HomeActivity : LocaleAwareAppCompatActivity() {
intent ?: return
val intentProcessors = listOf(CrashReporterIntentProcessor()) + externalSourceIntentProcessors
intentProcessors.any { it.process(intent, navHost.navController, this.intent) }
val intentHandled = intentProcessors.any { it.process(intent, navHost.navController, this.intent) }
browsingModeManager.mode = getModeFromIntentOrLastKnown(intent)
if (intentHandled) {
supportFragmentManager
.primaryNavigationFragment
?.childFragmentManager
?.fragments
?.lastOrNull()
?.let { it as? TabTrayDialogFragment }
?.also { it.dismissAllowingStateLoss() }
}
}
/**