blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #4412: Only consume state change when UI initialized

master
Christian Sadilek 2019-08-01 11:10:13 -04:00
parent f815ef1dd0
commit 9887945296
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -227,6 +227,27 @@ class BrowserFragment : Fragment(), BackHandler {
browserToolbarView.view.setOnSiteSecurityClickedListener {
showQuickSettingsDialog()
}
customTabSessionId?.let { customTabSessionId ->
customTabsIntegration.set(
feature = CustomTabsIntegration(
requireContext(),
requireComponents.core.sessionManager,
toolbar,
customTabSessionId,
activity,
view.nestedScrollQuickAction,
view.swipeRefresh,
onItemTapped = { browserInteractor.onBrowserToolbarMenuItemTapped(it) }
),
owner = this,
view = view)
}
consumeFrom(browserStore) {
quickActionSheetView.update(it)
browserToolbarView.update(it)
}
}
contextMenuFeature.set(
@ -404,27 +425,6 @@ class BrowserFragment : Fragment(), BackHandler {
owner = this,
view = view
)
customTabSessionId?.let {
customTabsIntegration.set(
feature = CustomTabsIntegration(
requireContext(),
requireComponents.core.sessionManager,
toolbar,
it,
activity,
view.nestedScrollQuickAction,
view.swipeRefresh,
onItemTapped = { browserInteractor.onBrowserToolbarMenuItemTapped(it) }
),
owner = this,
view = view)
}
consumeFrom(browserStore) {
quickActionSheetView.update(it)
browserToolbarView.update(it)
}
}
private fun themeReaderViewControlsForPrivateMode(view: View) = with(view) {