Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
},
onShouldShowRequestPermissionRationale = { shouldShowRequestPermissionRationale(it) },
store = requireComponents.core.store,
coroutineScope = requireComponents.applicationScope,
),
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
# Android Components
android-components = "160.0.20261019073400"
android-components = "161.0.20261028094858"

# AGP
android-gradle-plugin = "9.4.1"
Expand Down Expand Up @@ -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" }
Expand Down
Loading