blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fixes #568: Crash on custom tabs menu if no other tabs are open

master
Colin Lee 2019-02-17 13:10:29 -06:00 committed by Jeff Boek
parent b42a512b87
commit 66ebb652a6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
View File

@ -66,11 +66,14 @@ class ToolbarUIView(
}
with(view.context) {
val session = sessionId?.let { components.core.sessionManager.findSessionById(sessionId) }
?: components.core.sessionManager.selectedSession
toolbarIntegration = ToolbarIntegration(
this,
view,
ToolbarMenu(this,
requestDesktopStateProvider = { components.core.sessionManager.selectedSessionOrThrow.desktopMode },
requestDesktopStateProvider = { session?.desktopMode ?: false },
onItemTapped = { actionEmitter.onNext(SearchAction.ToolbarMenuItemTapped(it)) }
),
ShippedDomainsProvider().also { it.initialize(this) },