diff --git a/packages/flutter_mozilla_components/android/build.gradle b/packages/flutter_mozilla_components/android/build.gradle index 935fc144..d1008fd2 100644 --- a/packages/flutter_mozilla_components/android/build.gradle +++ b/packages/flutter_mozilla_components/android/build.gradle @@ -3,7 +3,7 @@ version = "1.0-SNAPSHOT" buildscript { ext.kotlin_version = "2.1.20" - ext.mozillaComponentsVersion = '141.0b5' + ext.mozillaComponentsVersion = '140.0.3' repositories { google() diff --git a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/Components.kt b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/Components.kt index 3a181b22..98d7f331 100644 --- a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/Components.kt +++ b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/Components.kt @@ -58,5 +58,5 @@ class Components(private val context: Context, val dateTimeProvider: DateTimeProvider by lazy { DefaultDateTimeProvider() } - val downloadEstimator: DownloadEstimator by lazy { DownloadEstimator(dateTimeProvider = dateTimeProvider) } + //val downloadEstimator: DownloadEstimator by lazy { DownloadEstimator(dateTimeProvider = dateTimeProvider) } } \ No newline at end of file diff --git a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/addons/WebExtensionPromptFeature.kt b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/addons/WebExtensionPromptFeature.kt index deffaafb..5983d0e3 100644 --- a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/addons/WebExtensionPromptFeature.kt +++ b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/addons/WebExtensionPromptFeature.kt @@ -165,9 +165,10 @@ class WebExtensionPromptFeature( addon = addon, permissions = permissions, origins = origins, - dataCollectionPermissions = emptyList(), +// dataCollectionPermissions = emptyList(), forOptionalPermissions = forOptionalPermissions, - onPositiveButtonClicked = { _, privateBrowsingAllowed, _ -> +// onPositiveButtonClicked = { _, privateBrowsingAllowed, _ -> + onPositiveButtonClicked = { _, privateBrowsingAllowed, -> handlePermissions( promptRequest, granted = true, @@ -196,7 +197,8 @@ class WebExtensionPromptFeature( private fun tryToReAttachButtonHandlersToPreviousDialog() { findPreviousDialogFragment()?.let { dialog -> - dialog.onPositiveButtonClicked = { addon, privateBrowsingAllowed, _ -> +// dialog.onPositiveButtonClicked = { addon, privateBrowsingAllowed, _ -> + dialog.onPositiveButtonClicked = { addon, privateBrowsingAllowed -> store.state.webExtensionPromptRequest?.let { promptRequest -> if (promptRequest is WebExtensionPromptRequest.AfterInstallation.Permissions && addon.id == promptRequest.extension.id diff --git a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/services/DownloadService.kt b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/services/DownloadService.kt index 3d2217b7..9d862fab 100644 --- a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/services/DownloadService.kt +++ b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/services/DownloadService.kt @@ -9,6 +9,7 @@ package eu.weblibre.flutter_mozilla_components.services import eu.weblibre.flutter_mozilla_components.GlobalComponents import mozilla.components.browser.state.store.BrowserStore import mozilla.components.feature.downloads.AbstractFetchDownloadService +import mozilla.components.feature.downloads.DateTimeProvider import mozilla.components.feature.downloads.DownloadEstimator import mozilla.components.feature.downloads.FileSizeFormatter import mozilla.components.support.base.android.NotificationsDelegate @@ -21,6 +22,7 @@ class DownloadService : AbstractFetchDownloadService() { override val httpClient by lazy { components.core.client } override val store: BrowserStore by lazy { components.core.store } override val notificationsDelegate: NotificationsDelegate by lazy { components.notificationsDelegate } + override val dateTimeProvider: DateTimeProvider by lazy { components.dateTimeProvider } override val fileSizeFormatter: FileSizeFormatter by lazy { components.fileSizeFormatter } - override val downloadEstimator: DownloadEstimator by lazy { components.downloadEstimator } + //override val downloadEstimator: DownloadEstimator by lazy { components.downloadEstimator } } \ No newline at end of file