blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #507 - Use just the presenter over the feature

master
Jeff Boek 2019-02-20 13:08:06 -08:00
parent 721d181d0b
commit b03266fca3
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
View File

@ -9,13 +9,12 @@ import android.graphics.PorterDuff
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.navigation.Navigation import androidx.navigation.Navigation
import mozilla.components.browser.domains.autocomplete.DomainAutocompleteProvider import mozilla.components.browser.domains.autocomplete.DomainAutocompleteProvider
import mozilla.components.browser.session.Session
import mozilla.components.browser.session.SessionManager import mozilla.components.browser.session.SessionManager
import mozilla.components.browser.session.runWithSession import mozilla.components.browser.session.runWithSession
import mozilla.components.browser.toolbar.BrowserToolbar import mozilla.components.browser.toolbar.BrowserToolbar
import mozilla.components.concept.storage.HistoryStorage import mozilla.components.concept.storage.HistoryStorage
import mozilla.components.feature.toolbar.ToolbarAutocompleteFeature import mozilla.components.feature.toolbar.ToolbarAutocompleteFeature
import mozilla.components.feature.toolbar.ToolbarFeature import mozilla.components.feature.toolbar.ToolbarPresenter
import mozilla.components.support.base.feature.LifecycleAwareFeature import mozilla.components.support.base.feature.LifecycleAwareFeature
import org.mozilla.fenix.DefaultThemeManager import org.mozilla.fenix.DefaultThemeManager
import org.mozilla.fenix.R import org.mozilla.fenix.R
@ -67,28 +66,17 @@ class ToolbarIntegration(
} }
} }
private val toolbarFeature: ToolbarFeature = ToolbarFeature( private val toolbarPresenter: ToolbarPresenter = ToolbarPresenter(
toolbar, toolbar,
context.components.core.sessionManager, context.components.core.sessionManager,
if (sessionId == null) {
if (isPrivate) {
context.components.useCases.tabsUseCases.addPrivateTab
} else {
context.components.useCases.tabsUseCases.addTab
}
} else context.components.useCases.sessionUseCases.loadUrl,
{ searchTerms -> if (sessionId == null) {
context.components.useCases.searchUseCases.newTabSearch
.invoke(searchTerms, Session.Source.USER_ENTERED, true, isPrivate)
} else context.components.useCases.searchUseCases.defaultSearch.invoke(searchTerms) },
sessionId sessionId
) )
override fun start() { override fun start() {
toolbarFeature.start() toolbarPresenter.start()
} }
override fun stop() { override fun stop() {
toolbarFeature.stop() toolbarPresenter.stop()
} }
} }