Advertisement
Guest User

Untitled

a guest
Oct 18th, 2019
114
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.48 KB | None | 0 0
  1. diff --git a/app/src/main/java/org/mozilla/reference/browser/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/reference/browser/components/BackgroundServices.kt
  2. index 8d18c3b..c5818ee 100644
  3. --- a/app/src/main/java/org/mozilla/reference/browser/components/BackgroundServices.kt
  4. +++ b/app/src/main/java/org/mozilla/reference/browser/components/BackgroundServices.kt
  5. @@ -34,7 +34,7 @@ class BackgroundServices(
  6. -
  7. init {
  8. // Make the "history" store accessible to workers spawned by the sync manager.
  9. - GlobalSyncableStoreProvider.configureStore(SyncEngine.HISTORY to placesHistoryStorage)
  10. + GlobalSyncableStoreProvider.configureStore(SyncEngine.History to placesHistoryStorage)
  11. }
  12. -
  13. private val serverConfig = ServerConfig.release(CLIENT_ID, REDIRECT_URL)
  14. @@ -44,7 +44,7 @@ class BackgroundServices(
  15. capabilities = setOf(DeviceCapability.SEND_TAB)
  16. )
  17. private val syncConfig = SyncConfig(
  18. - supportedEngines = setOf(SyncEngine.HISTORY),
  19. + supportedEngines = setOf(SyncEngine.History),
  20. syncPeriodInMinutes = 240L
  21. ) // four hours
  22. -
  23. diff --git a/app/src/main/java/org/mozilla/reference/browser/settings/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/reference/browser/settings/AccountSettingsFragment.kt
  24. index 17e44dd..1d6942a 100644
  25. --- a/app/src/main/java/org/mozilla/reference/browser/settings/AccountSettingsFragment.kt
  26. +++ b/app/src/main/java/org/mozilla/reference/browser/settings/AccountSettingsFragment.kt
  27. @@ -13,6 +13,7 @@ import androidx.preference.PreferenceFragmentCompat
  28. import kotlinx.coroutines.CoroutineScope
  29. import kotlinx.coroutines.Dispatchers
  30. import kotlinx.coroutines.launch
  31. +import mozilla.components.service.fxa.sync.SyncReason
  32. import mozilla.components.service.fxa.sync.SyncStatusObserver
  33. import mozilla.components.service.fxa.sync.getLastSynced
  34. import org.mozilla.reference.browser.R
  35. @@ -116,7 +117,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
  36. return OnPreferenceClickListener {
  37. CoroutineScope(Dispatchers.Main).launch {
  38. // Trigger a sync & update devices.
  39. - requireComponents.backgroundServices.accountManager.syncNowAsync().await()
  40. + requireComponents.backgroundServices.accountManager.syncNowAsync(SyncReason.User).await()
  41. // Poll for device events.
  42. requireComponents.backgroundServices.accountManager.authenticatedAccount()
  43. ?.deviceConstellation()?.run {
  44. ~
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement