Skip to content

Commit 6fe7b7b

Browse files
MickeyMozjonalmeida
authored andcommitted
Update Android Components version to 150.0.20260226092447.
1 parent 1f2044d commit 6fe7b7b

File tree

8 files changed

+62
-7
lines changed

8 files changed

+62
-7
lines changed

app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionPromptFeature.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ class WebExtensionPromptFeature(
286286
}
287287

288288
is WebExtensionInstallException.SoftBlocked -> {
289-
context.getString(addonsR.string.mozac_feature_addons_soft_blocked_1, addonName, R.string.app_name)
289+
context.getString(addonsR.string.mozac_feature_addons_soft_blocked_2, addonName, R.string.app_name)
290290
}
291291

292292
is WebExtensionInstallException.UserCancelled -> {

app/src/main/java/org/mozilla/reference/browser/browser/BaseBrowserFragment.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import android.content.Intent
88
import android.content.pm.PackageManager
99
import android.os.Build
1010
import android.os.Bundle
11+
import android.os.Environment
1112
import android.view.LayoutInflater
1213
import android.view.View
1314
import android.view.ViewGroup
@@ -44,6 +45,7 @@ import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
4445
import mozilla.components.support.base.log.logger.Logger
4546
import mozilla.components.support.ktx.android.view.enterImmersiveMode
4647
import mozilla.components.support.ktx.android.view.exitImmersiveMode
48+
import mozilla.components.support.utils.DefaultDownloadFileUtils
4749
import mozilla.components.ui.widgets.behavior.DependencyGravity
4850
import mozilla.components.ui.widgets.behavior.EngineViewClippingBehavior
4951
import mozilla.components.ui.widgets.behavior.EngineViewScrollingGesturesBehavior
@@ -242,6 +244,12 @@ abstract class BaseBrowserFragment :
242244
store = requireComponents.core.store,
243245
useCases = requireComponents.useCases.downloadsUseCases,
244246
fragmentManager = childFragmentManager,
247+
downloadFileUtils = DefaultDownloadFileUtils(
248+
context = requireContext().applicationContext,
249+
downloadLocation = {
250+
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).path
251+
},
252+
),
245253
downloadManager = FetchDownloadManager(
246254
requireContext().applicationContext,
247255
requireComponents.core.store,

app/src/main/java/org/mozilla/reference/browser/browser/BrowserFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class BrowserFragment :
9595
)
9696
awesomeBar.setOnRemoveSuggestionButtonClicked {
9797
awesomeBar.addHiddenSuggestion(it)
98-
deleteHistorySuggestion(it.suggestion)
98+
(it.suggestion as? Suggestion)?.let { s -> deleteHistorySuggestion(s) }
9999
}
100100

101101
TabsToolbarFeature(

app/src/main/java/org/mozilla/reference/browser/browser/ContextMenuIntegration.kt

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package org.mozilla.reference.browser.browser
66

77
import android.content.Context
8+
import android.os.Environment
89
import android.view.View
910
import androidx.fragment.app.FragmentManager
1011
import mozilla.components.browser.state.store.BrowserStore
@@ -39,11 +40,25 @@ class ContextMenuIntegration(
3940
createCopyLinkCandidate(context, parentView, snackbarDelegate),
4041
createShareLinkCandidate(context),
4142
createOpenImageInNewTabCandidate(context, tabsUseCases, parentView, snackbarDelegate),
42-
createSaveImageCandidate(context, contextMenuUseCases),
43+
createSaveImageCandidate(
44+
context,
45+
contextMenuUseCases,
46+
downloadsLocation = {
47+
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).path
48+
},
49+
),
4350
createCopyImageLocationCandidate(context, parentView, snackbarDelegate),
4451
)
4552
} else {
46-
ContextMenuCandidate.defaultCandidates(context, tabsUseCases, contextMenuUseCases, parentView)
53+
ContextMenuCandidate.defaultCandidates(
54+
context,
55+
tabsUseCases,
56+
contextMenuUseCases,
57+
parentView,
58+
downloadsLocation = {
59+
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).path
60+
},
61+
)
4762
}
4863
}
4964

app/src/main/java/org/mozilla/reference/browser/components/Core.kt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package org.mozilla.reference.browser.components
66

77
import android.content.Context
88
import android.content.SharedPreferences
9+
import android.os.Environment
910
import androidx.preference.PreferenceManager
1011
import mozilla.components.browser.engine.gecko.permission.GeckoSitePermissionsStorage
1112
import mozilla.components.browser.icons.BrowserIcons
@@ -43,6 +44,7 @@ import mozilla.components.lib.dataprotect.SecureAbove22Preferences
4344
import mozilla.components.service.location.LocationService
4445
import mozilla.components.service.sync.logins.SyncableLoginsStorage
4546
import mozilla.components.support.base.worker.Frequency
47+
import mozilla.components.support.utils.DefaultDownloadFileUtils
4648
import org.mozilla.reference.browser.AppRequestInterceptor
4749
import org.mozilla.reference.browser.BrowserActivity
4850
import org.mozilla.reference.browser.EngineProvider
@@ -100,7 +102,17 @@ class Core(
100102
val store by lazy {
101103
BrowserStore(
102104
middleware = listOf(
103-
DownloadMiddleware(context, DownloadService::class.java, { false }),
105+
DownloadMiddleware(
106+
applicationContext = context,
107+
downloadServiceClass = DownloadService::class.java,
108+
deleteFileFromStorage = { false },
109+
downloadFileUtils = DefaultDownloadFileUtils(
110+
context = context,
111+
downloadLocation = {
112+
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).path
113+
},
114+
),
115+
),
104116
ThumbnailsMiddleware(thumbnailStorage),
105117
ReaderViewMiddleware(),
106118
RegionMiddleware(

app/src/main/java/org/mozilla/reference/browser/components/UseCases.kt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package org.mozilla.reference.browser.components
66

77
import android.content.Context
8+
import android.os.Environment
89
import mozilla.components.browser.state.store.BrowserStore
910
import mozilla.components.concept.engine.Engine
1011
import mozilla.components.feature.contextmenu.ContextMenuUseCases
@@ -16,6 +17,7 @@ import mozilla.components.feature.session.SessionUseCases
1617
import mozilla.components.feature.session.SettingsUseCases
1718
import mozilla.components.feature.tabs.CustomTabsUseCases
1819
import mozilla.components.feature.tabs.TabsUseCases
20+
import mozilla.components.support.utils.DefaultDownloadFileUtils
1921

2022
/**
2123
* Component group for all use cases. Use cases are provided by feature
@@ -62,7 +64,17 @@ class UseCases(
6264
/**
6365
* Use cases related to the downloads feature.
6466
*/
65-
val downloadsUseCases: DownloadsUseCases by lazy { DownloadsUseCases(store, context) }
67+
val downloadsUseCases: DownloadsUseCases by lazy {
68+
DownloadsUseCases(
69+
store = store,
70+
downloadFileUtils = DefaultDownloadFileUtils(
71+
context = context,
72+
downloadLocation = {
73+
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).path
74+
},
75+
),
76+
)
77+
}
6678

6779
/**
6880
* Use cases related to Custom Tabs.

app/src/main/java/org/mozilla/reference/browser/downloads/DownloadService.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import mozilla.components.feature.downloads.DefaultPackageNameProvider
1111
import mozilla.components.feature.downloads.DownloadEstimator
1212
import mozilla.components.feature.downloads.FileSizeFormatter
1313
import mozilla.components.feature.downloads.PackageNameProvider
14+
import mozilla.components.feature.downloads.filewriter.DefaultDownloadFileWriter
15+
import mozilla.components.feature.downloads.filewriter.DownloadFileWriter
1416
import mozilla.components.support.base.android.NotificationsDelegate
1517
import mozilla.components.support.utils.DefaultDownloadFileUtils
1618
import mozilla.components.support.utils.DownloadFileUtils
@@ -30,5 +32,11 @@ class DownloadService : AbstractFetchDownloadService() {
3032
},
3133
)
3234
}
35+
override val downloadFileWriter: DownloadFileWriter by lazy {
36+
DefaultDownloadFileWriter(
37+
context = applicationContext,
38+
downloadFileUtils = downloadFileUtils,
39+
)
40+
}
3341
override val packageNameProvider: PackageNameProvider by lazy { DefaultPackageNameProvider(applicationContext) }
3442
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
# Android Components
3-
android-components = "149.0.20260223091613"
3+
android-components = "150.0.20260226092447"
44

55
# AGP
66
android-gradle-plugin = "9.0.0"

0 commit comments

Comments
 (0)