diff --git a/app/build.gradle b/app/build.gradle index e839c904e..51996402e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -270,6 +270,7 @@ dependencies { implementation libs.mozilla.service.firefox.accounts implementation libs.mozilla.service.location + implementation libs.mozilla.service.merino.manifest implementation libs.mozilla.service.sync.logins implementation libs.mozilla.support.appservices diff --git a/app/src/main/java/org/mozilla/reference/browser/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/reference/browser/browser/BaseBrowserFragment.kt index 886b14d8f..2ce9fe7d4 100644 --- a/app/src/main/java/org/mozilla/reference/browser/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/reference/browser/browser/BaseBrowserFragment.kt @@ -418,6 +418,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit }, onShouldShowRequestPermissionRationale = { shouldShowRequestPermissionRationale(it) }, store = requireComponents.core.store, + coroutineScope = requireComponents.applicationScope, ), ) diff --git a/app/src/main/java/org/mozilla/reference/browser/components/Core.kt b/app/src/main/java/org/mozilla/reference/browser/components/Core.kt index ff8231502..91be146ec 100644 --- a/app/src/main/java/org/mozilla/reference/browser/components/Core.kt +++ b/app/src/main/java/org/mozilla/reference/browser/components/Core.kt @@ -171,7 +171,10 @@ class Core( /** A storage component for site permissions. */ val geckoSitePermissionsStorage by lazy { val geckoRuntime = EngineProvider.getOrCreateRuntime(context) - GeckoSitePermissionsStorage(geckoRuntime, OnDiskSitePermissionsStorage(context)) + GeckoSitePermissionsStorage( + geckoRuntime, + OnDiskSitePermissionsStorage(context, coroutineScope = applicationScope), + ) } /** Icons component for loading, caching and processing website icons. */ diff --git a/app/src/main/java/org/mozilla/reference/browser/settings/PairSettingsFragment.kt b/app/src/main/java/org/mozilla/reference/browser/settings/PairSettingsFragment.kt index 6176d11a1..ec9bf1177 100644 --- a/app/src/main/java/org/mozilla/reference/browser/settings/PairSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/reference/browser/settings/PairSettingsFragment.kt @@ -13,6 +13,7 @@ import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.fragment.app.Fragment import mozilla.components.feature.qr.QrFeature +import mozilla.components.service.fxa.FxaService import mozilla.components.service.fxa.manager.SCOPE_PROFILE import mozilla.components.service.fxa.manager.SCOPE_SESSION import mozilla.components.service.fxa.manager.SCOPE_SYNC @@ -61,7 +62,8 @@ class PairSettingsFragment : Fragment(), UserInteractionHandler { requireContext(), pairingUrl, BrowserFxAEntryPoint.HomeMenu, - setOf(SCOPE_SYNC, SCOPE_PROFILE, SCOPE_SESSION), + service = FxaService.Sync.identifier, + scopes = setOf(SCOPE_SYNC, SCOPE_PROFILE, SCOPE_SESSION), ) activity?.finish() }, diff --git a/app/src/main/java/org/mozilla/reference/browser/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/reference/browser/settings/SettingsFragment.kt index bf97c1c71..f45813cc0 100644 --- a/app/src/main/java/org/mozilla/reference/browser/settings/SettingsFragment.kt +++ b/app/src/main/java/org/mozilla/reference/browser/settings/SettingsFragment.kt @@ -20,6 +20,7 @@ import androidx.preference.Preference.OnPreferenceClickListener import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreferenceCompat import kotlin.system.exitProcess +import mozilla.components.service.fxa.FxaService import mozilla.components.service.fxa.manager.SCOPE_PROFILE import mozilla.components.service.fxa.manager.SCOPE_SYNC import mozilla.components.support.ktx.android.view.showKeyboard @@ -122,7 +123,8 @@ class SettingsFragment : PreferenceFragmentCompat() { requireComponents.services.accountsAuthFeature.beginAuthentication( requireContext(), BrowserFxAEntryPoint.HomeMenu, - setOf(SCOPE_PROFILE, SCOPE_SYNC), + service = FxaService.Sync.identifier, + scopes = setOf(SCOPE_PROFILE, SCOPE_SYNC), ) activity?.finish() true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4000d0ac7..e18e83b26 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # Android Components -android-components = "160.0.20261019073400" +android-components = "161.0.20261028094858" # AGP android-gradle-plugin = "9.4.1" @@ -171,6 +171,7 @@ mozilla-lib-state = { group = "org.mozilla.components", name = "lib-state", vers mozilla-service-firefox-accounts = { group = "org.mozilla.components", name = "service-firefox-accounts", version.ref = "android-components" } mozilla-service-location = { group = "org.mozilla.components", name = "service-location", version.ref = "android-components" } +mozilla-service-merino-manifest = { group = "org.mozilla.components", name = "service-merino-manifest", version.ref = "android-components" } mozilla-service-sync-logins = { group = "org.mozilla.components", name = "service-sync-logins", version.ref = "android-components" } mozilla-support-appservices = { group = "org.mozilla.components", name = "support-appservices", version.ref = "android-components" }