Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

[fenix] Closes https://github.com/mozilla-mobile/fenix/issues/919: Enable bookmarks synchronization

Browse Source
This commit is contained in:
Grisha Kruglov 2019-04-23 13:53:47 -07:00 committed by Colin Lee
parent 95b60a0495
commit 9c347a31ba
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
View File

@ -8,6 +8,7 @@ import android.content.Context
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import mozilla.components.browser.storage.sync.PlacesBookmarksStorage
import mozilla.components.browser.storage.sync.PlacesHistoryStorage import mozilla.components.browser.storage.sync.PlacesHistoryStorage
import mozilla.components.feature.sync.BackgroundSyncManager import mozilla.components.feature.sync.BackgroundSyncManager
import mozilla.components.feature.sync.GlobalSyncableStoreProvider import mozilla.components.feature.sync.GlobalSyncableStoreProvider
@ -20,7 +21,8 @@ import mozilla.components.service.fxa.FxaAccountManager
*/ */
class BackgroundServices( class BackgroundServices(
context: Context, context: Context,
historyStorage: PlacesHistoryStorage historyStorage: PlacesHistoryStorage,
bookmarkStorage: PlacesBookmarksStorage
) { ) {
companion object { companion object {
const val CLIENT_ID = "a2270f727f45f648" const val CLIENT_ID = "a2270f727f45f648"
@ -35,12 +37,14 @@ class BackgroundServices(
private val config = Config.release(CLIENT_ID, REDIRECT_URL) private val config = Config.release(CLIENT_ID, REDIRECT_URL)
init { init {
// Make the "history" store accessible to workers spawned by the sync manager. // Make the "history" and "bookmark" stores accessible to workers spawned by the sync manager.
GlobalSyncableStoreProvider.configureStore("history" to historyStorage) GlobalSyncableStoreProvider.configureStore("history" to historyStorage)
GlobalSyncableStoreProvider.configureStore("bookmarks" to bookmarkStorage)
} }
val syncManager = BackgroundSyncManager("https://identity.mozilla.com/apps/oldsync").also { val syncManager = BackgroundSyncManager("https://identity.mozilla.com/apps/oldsync").also {
it.addStore("history") it.addStore("history")
it.addStore("bookmarks")
} }
val accountManager = FxaAccountManager(context, config, scopes, syncManager).also { val accountManager = FxaAccountManager(context, config, scopes, syncManager).also {

2
app/src/main/java/org/mozilla/fenix/components/Components.kt
View File

@ -10,7 +10,7 @@ import android.content.Context
* Provides access to all components. * Provides access to all components.
*/ */
class Components(private val context: Context) { class Components(private val context: Context) {
val backgroundServices by lazy { BackgroundServices(context, core.historyStorage) } val backgroundServices by lazy { BackgroundServices(context, core.historyStorage, core.bookmarksStorage) }
val services by lazy { Services(backgroundServices.accountManager, useCases.tabsUseCases) } val services by lazy { Services(backgroundServices.accountManager, useCases.tabsUseCases) }
val core by lazy { Core(context) } val core by lazy { Core(context) }
val search by lazy { Search(context) } val search by lazy { Search(context) }