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

Upgrade to GV 68.0.20190508111321 and fixes for latest A-C 0.52.0 (#2348)

Browse Source 
Closes #2342, Closes #2297
This commit is contained in:
Christian Sadilek 2019-05-08 12:04:06 -04:00 committed by Colin Lee
parent 78f8354fbb
commit 0c1b43d7b6
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,10 +10,12 @@ 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.PlacesBookmarksStorage
import mozilla.components.browser.storage.sync.PlacesHistoryStorage import mozilla.components.browser.storage.sync.PlacesHistoryStorage
import mozilla.components.concept.sync.DeviceType
import mozilla.components.feature.sync.BackgroundSyncManager import mozilla.components.feature.sync.BackgroundSyncManager
import mozilla.components.feature.sync.GlobalSyncableStoreProvider import mozilla.components.feature.sync.GlobalSyncableStoreProvider
import mozilla.components.service.fxa.Config import mozilla.components.service.fxa.Config
import mozilla.components.service.fxa.FxaAccountManager import mozilla.components.service.fxa.manager.DeviceTuple
import mozilla.components.service.fxa.manager.FxaAccountManager
import org.mozilla.fenix.test.Mockable import org.mozilla.fenix.test.Mockable
/** /**
@ -49,7 +51,13 @@ class BackgroundServices(
it.addStore("bookmarks") it.addStore("bookmarks")
} }
val accountManager = FxaAccountManager(context, config, scopes, syncManager).also { val accountManager = FxaAccountManager(
context,
config,
scopes,
DeviceTuple("Fenix", DeviceType.MOBILE, emptyList()),
syncManager
).also {
CoroutineScope(Dispatchers.Main).launch { it.initAsync().await() } CoroutineScope(Dispatchers.Main).launch { it.initAsync().await() }
} }
} }

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

@ -6,7 +6,7 @@ package org.mozilla.fenix.components
import mozilla.components.feature.accounts.FirefoxAccountsAuthFeature import mozilla.components.feature.accounts.FirefoxAccountsAuthFeature
import mozilla.components.feature.tabs.TabsUseCases import mozilla.components.feature.tabs.TabsUseCases
import mozilla.components.service.fxa.FxaAccountManager import mozilla.components.service.fxa.manager.FxaAccountManager
import org.mozilla.fenix.test.Mockable import org.mozilla.fenix.test.Mockable
/** /**

2
buildSrc/src/main/java/Gecko.kt
View File

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
object GeckoVersions { object GeckoVersions {
const val nightly_version = "68.0.20190503041749" const val nightly_version = "68.0.20190508111321"
const val beta_version = "67.0.20190430135507" const val beta_version = "67.0.20190430135507"
const val release_version = "66.0.20190322021635" const val release_version = "66.0.20190322021635"
} }