MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

added many suggestion modules

Browse Source
This commit is contained in:
Fabian Freund
2026-03-09 03:10:02 +01:00
parent 84038c7b81
commit a7b4954da1
35 changed files with 4593 additions and 2077 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/GlobalComponents.kt
+6
View File
@@ -42,6 +42,8 @@ import mozilla.components.support.webextensions.WebExtensionSupport
import java.io.File
import java.util.concurrent.TimeUnit
private const val HISTORY_METADATA_MAX_AGE_IN_MS = 14L * 24 * 60 * 60 * 1000 // 14 days
object GlobalComponents {
private var _components: Components? = null
private var currentMode: ComponentsMode? = null
@@ -203,6 +205,10 @@ object GlobalComponents {
try {
GlobalPlacesDependencyProvider.initialize(newComponents.core.historyStorage)
newComponents.core.historyMetadataService.cleanup(
System.currentTimeMillis() - HISTORY_METADATA_MAX_AGE_IN_MS,
)
GlobalAddonDependencyProvider.initialize(
newComponents.core.addonManager,
newComponents.core.addonUpdater,
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/api/GeckoHistoryApiImpl.kt
+30
View File
@@ -2,6 +2,8 @@ package eu.weblibre.flutter_mozilla_components.api
import eu.weblibre.flutter_mozilla_components.GlobalComponents
import eu.weblibre.flutter_mozilla_components.pigeons.GeckoHistoryApi
import eu.weblibre.flutter_mozilla_components.pigeons.HistoryHighlight
import eu.weblibre.flutter_mozilla_components.pigeons.HistoryHighlightWeights
import eu.weblibre.flutter_mozilla_components.pigeons.VisitInfo
import eu.weblibre.flutter_mozilla_components.pigeons.VisitType
import kotlinx.coroutines.CoroutineScope
@@ -206,4 +208,32 @@ class GeckoHistoryApiImpl() : GeckoHistoryApi {
}
}
}
override fun getHistoryHighlights(
weights: HistoryHighlightWeights,
limit: Long,
callback: (Result<List<HistoryHighlight>>) -> Unit
) {
coroutineScope.launch {
withContext(Dispatchers.Main) {
val conceptWeights = mozilla.components.concept.storage.HistoryHighlightWeights(
viewTime = weights.viewTime,
frequency = weights.frequency,
)
val highlights = components.core.historyStorage.getHistoryHighlights(
conceptWeights,
limit.toInt(),
).map {
HistoryHighlight(
score = it.score,
placeId = it.placeId.toLong(),
url = it.url,
title = it.title,
previewImageUrl = it.previewImageUrl,
)
}
callback(Result.success(highlights))
}
}
}
}
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/components/Core.kt
+7
View File
@@ -21,6 +21,8 @@ import eu.weblibre.flutter_mozilla_components.activities.NotificationActivity
import eu.weblibre.flutter_mozilla_components.R
import eu.weblibre.flutter_mozilla_components.ext.getPreferenceKey
import eu.weblibre.flutter_mozilla_components.middleware.FlutterEventMiddleware
import eu.weblibre.flutter_mozilla_components.middleware.HistoryMetadataMiddleware
import eu.weblibre.flutter_mozilla_components.middleware.HistoryMetadataService
import eu.weblibre.flutter_mozilla_components.middleware.SaveToPDFMiddleware
import eu.weblibre.flutter_mozilla_components.pigeons.BrowserExtensionEvents
import eu.weblibre.flutter_mozilla_components.pigeons.GeckoStateEvents
@@ -193,10 +195,15 @@ class Core(
FileUploadsDirCleaner { context.cacheDir }
}
val historyMetadataService by lazy {
HistoryMetadataService(storage = historyStorage)
}
@OptIn(FlowPreview::class)
val store by lazy {
BrowserStore(
middleware = listOf(
HistoryMetadataMiddleware(historyMetadataService),
FlutterEventMiddleware(flutterEvents),
DownloadMiddleware(context, DownloadService::class.java, { false }),
ThumbnailsMiddleware(thumbnailStorage),
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/middleware/HistoryMetadataMiddleware.kt
+114
View File
@@ -0,0 +1,114 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
package eu.weblibre.flutter_mozilla_components.middleware
import mozilla.components.browser.state.action.BrowserAction
import mozilla.components.browser.state.action.ContentAction
import mozilla.components.browser.state.action.HistoryMetadataAction
import mozilla.components.browser.state.action.MediaSessionAction
import mozilla.components.browser.state.action.TabListAction
import mozilla.components.browser.state.selector.findNormalTab
import mozilla.components.browser.state.selector.selectedNormalTab
import mozilla.components.browser.state.state.BrowserState
import mozilla.components.browser.state.state.TabSessionState
import mozilla.components.lib.state.Middleware
import mozilla.components.lib.state.Store
/**
* Records history metadata observations as the user browses.
*
* - On page load: records a [DocumentTypeObservation] so the page exists in metadata storage.
* - On tab switch / removal / URL change: records a [ViewTimeObservation] for the outgoing page.
*
* This is a simplified version of Fenix's HistoryMetadataMiddleware without search-group tracking.
*/
class HistoryMetadataMiddleware(
private val historyMetadataService: HistoryMetadataService,
) : Middleware<BrowserState, BrowserAction> {
override fun invoke(
store: Store<BrowserState, BrowserAction>,
next: (BrowserAction) -> Unit,
action: BrowserAction,
) {
// Pre-process: update view time for the currently selected tab before state changes.
when (action) {
is TabListAction.AddTabAction -> {
if (action.select) {
store.state.selectedNormalTab?.let { updateHistoryMetadata(it) }
}
}
is TabListAction.SelectTabAction -> {
store.state.selectedNormalTab?.let { updateHistoryMetadata(it) }
}
is TabListAction.RemoveTabAction -> {
if (action.tabId == store.state.selectedTabId) {
store.state.findNormalTab(action.tabId)?.let { updateHistoryMetadata(it) }
}
}
is TabListAction.RemoveTabsAction -> {
action.tabIds.find { it == store.state.selectedTabId }?.let {
store.state.findNormalTab(it)?.let { tab -> updateHistoryMetadata(tab) }
}
}
is ContentAction.UpdateUrlAction -> {
store.state.findNormalTab(action.sessionId)?.let { tab ->
if (tab.id == store.state.selectedTabId && action.url != tab.content.url) {
updateHistoryMetadata(tab)
}
}
}
else -> { /* no-op */ }
}
next(action)
// Post-process: create metadata for newly loaded pages (state is now up-to-date).
when (action) {
is TabListAction.AddTabAction -> {
if (!action.tab.content.private) {
createHistoryMetadataIfNeeded(store, action.tab)
}
}
is ContentAction.UpdateHistoryStateAction -> {
store.state.findNormalTab(action.sessionId)?.let { tab ->
createHistoryMetadataIfNeeded(store, tab)
}
}
is MediaSessionAction.UpdateMediaMetadataAction -> {
store.state.findNormalTab(action.tabId)?.let { tab ->
createHistoryMetadata(store, tab)
}
}
else -> { /* no-op */ }
}
}
private fun createHistoryMetadataIfNeeded(
store: Store<BrowserState, BrowserAction>,
tab: TabSessionState,
) {
val knownMetadata = tab.historyMetadata
if (knownMetadata == null || knownMetadata.url != tab.content.url) {
createHistoryMetadata(store, tab)
}
}
private fun createHistoryMetadata(
store: Store<BrowserState, BrowserAction>,
tab: TabSessionState,
) {
val key = historyMetadataService.createMetadata(tab)
store.dispatch(HistoryMetadataAction.SetHistoryMetadataKeyAction(tab.id, key))
}
private fun updateHistoryMetadata(tab: TabSessionState) {
tab.historyMetadata?.let {
historyMetadataService.updateMetadata(it, tab)
}
}
}
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/middleware/HistoryMetadataService.kt
+78
View File
@@ -0,0 +1,78 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
package eu.weblibre.flutter_mozilla_components.middleware
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.launch
import mozilla.components.browser.state.state.TabSessionState
import mozilla.components.concept.storage.DocumentType
import mozilla.components.concept.storage.HistoryMetadataKey
import mozilla.components.concept.storage.HistoryMetadataObservation
import mozilla.components.concept.storage.HistoryMetadataStorage
import mozilla.components.support.base.utils.NamedThreadFactory
import java.util.concurrent.Executors
class HistoryMetadataService(
private val storage: HistoryMetadataStorage,
private val scope: CoroutineScope = CoroutineScope(
Executors.newSingleThreadExecutor(
NamedThreadFactory("HistoryMetadataService"),
).asCoroutineDispatcher(),
),
) {
private val tabsLastUpdated = mutableMapOf<String, Long>()
fun createMetadata(tab: TabSessionState): HistoryMetadataKey {
val existingMetadata = tab.historyMetadata
val metadataKey = if (existingMetadata != null && existingMetadata.url == tab.content.url) {
existingMetadata
} else {
HistoryMetadataKey(url = tab.content.url)
}
val documentTypeObservation = HistoryMetadataObservation.DocumentTypeObservation(
documentType = when (tab.mediaSessionState) {
null -> DocumentType.Regular
else -> DocumentType.Media
},
)
scope.launch {
storage.noteHistoryMetadataObservation(metadataKey, documentTypeObservation)
}
return metadataKey
}
fun cleanup(olderThan: Long) {
scope.launch {
storage.deleteHistoryMetadataOlderThan(olderThan)
}
}
fun updateMetadata(key: HistoryMetadataKey, tab: TabSessionState) {
val now = System.currentTimeMillis()
val lastAccess = tab.lastAccess
if (lastAccess == 0L) {
return
}
scope.launch {
val lastUpdated = tabsLastUpdated[tab.id] ?: 0
if (lastUpdated > lastAccess) {
return@launch
}
val viewTimeObservation = HistoryMetadataObservation.ViewTimeObservation(
viewTime = (now - lastAccess).toInt(),
)
storage.noteHistoryMetadataObservation(key, viewTimeObservation)
tabsLastUpdated[tab.id] = now
}
}
}
packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/pigeons/Gecko.g.kt
+204 -93
View File
@@ -1669,6 +1669,77 @@ data class VisitInfo (
override fun hashCode(): Int = toList().hashCode()
}
/** Generated class from Pigeon that represents data sent in messages. */
data class HistoryHighlightWeights (
val viewTime: Double,
val frequency: Double
)
{
companion object {
fun fromList(pigeonVar_list: List<Any?>): HistoryHighlightWeights {
val viewTime = pigeonVar_list[0] as Double
val frequency = pigeonVar_list[1] as Double
return HistoryHighlightWeights(viewTime, frequency)
}
}
fun toList(): List<Any?> {
return listOf(
viewTime,
frequency,
)
}
override fun equals(other: Any?): Boolean {
if (other !is HistoryHighlightWeights) {
return false
}
if (this === other) {
return true
}
return GeckoPigeonUtils.deepEquals(toList(), other.toList()) }
override fun hashCode(): Int = toList().hashCode()
}
/** Generated class from Pigeon that represents data sent in messages. */
data class HistoryHighlight (
val score: Double,
val placeId: Long,
val url: String,
val title: String? = null,
val previewImageUrl: String? = null
)
{
companion object {
fun fromList(pigeonVar_list: List<Any?>): HistoryHighlight {
val score = pigeonVar_list[0] as Double
val placeId = pigeonVar_list[1] as Long
val url = pigeonVar_list[2] as String
val title = pigeonVar_list[3] as String?
val previewImageUrl = pigeonVar_list[4] as String?
return HistoryHighlight(score, placeId, url, title, previewImageUrl)
}
}
fun toList(): List<Any?> {
return listOf(
score,
placeId,
url,
title,
previewImageUrl,
)
}
override fun equals(other: Any?): Boolean {
if (other !is HistoryHighlight) {
return false
}
if (this === other) {
return true
}
return GeckoPigeonUtils.deepEquals(toList(), other.toList()) }
override fun hashCode(): Int = toList().hashCode()
}
/** Generated class from Pigeon that represents data sent in messages. */
data class HistoryItem (
val url: String,
@@ -3985,235 +4056,245 @@ private open class GeckoPigeonCodec : StandardMessageCodec() {
}
185.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
HistoryItem.fromList(it)
HistoryHighlightWeights.fromList(it)
}
}
186.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
HistoryState.fromList(it)
HistoryHighlight.fromList(it)
}
}
187.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ReaderableState.fromList(it)
HistoryItem.fromList(it)
}
}
188.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
SecurityInfoState.fromList(it)
HistoryState.fromList(it)
}
}
189.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
TabContentState.fromList(it)
ReaderableState.fromList(it)
}
}
190.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
FindResultState.fromList(it)
SecurityInfoState.fromList(it)
}
}
191.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
CustomSelectionAction.fromList(it)
TabContentState.fromList(it)
}
}
192.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
WebExtensionData.fromList(it)
FindResultState.fromList(it)
}
}
193.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
GeckoSuggestion.fromList(it)
CustomSelectionAction.fromList(it)
}
}
194.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
TabContent.fromList(it)
WebExtensionData.fromList(it)
}
}
195.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ContentBlocking.fromList(it)
GeckoSuggestion.fromList(it)
}
}
196.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
DohSettings.fromList(it)
TabContent.fromList(it)
}
}
197.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
GeckoEngineSettings.fromList(it)
ContentBlocking.fromList(it)
}
}
198.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
AutocompleteResult.fromList(it)
DohSettings.fromList(it)
}
}
199.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
UnknownHitResult.fromList(it)
GeckoEngineSettings.fromList(it)
}
}
200.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ImageHitResult.fromList(it)
AutocompleteResult.fromList(it)
}
}
201.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
VideoHitResult.fromList(it)
UnknownHitResult.fromList(it)
}
}
202.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
AudioHitResult.fromList(it)
ImageHitResult.fromList(it)
}
}
203.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ImageSrcHitResult.fromList(it)
VideoHitResult.fromList(it)
}
}
204.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
PhoneHitResult.fromList(it)
AudioHitResult.fromList(it)
}
}
205.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
EmailHitResult.fromList(it)
ImageSrcHitResult.fromList(it)
}
}
206.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
GeoHitResult.fromList(it)
PhoneHitResult.fromList(it)
}
}
207.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
DownloadState.fromList(it)
EmailHitResult.fromList(it)
}
}
208.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ShareInternetResourceState.fromList(it)
GeoHitResult.fromList(it)
}
}
209.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
AddonCollection.fromList(it)
DownloadState.fromList(it)
}
}
210.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
SyncEngineStatus.fromList(it)
ShareInternetResourceState.fromList(it)
}
}
211.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
SyncAccountInfo.fromList(it)
AddonCollection.fromList(it)
}
}
212.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
SyncDevice.fromList(it)
SyncEngineStatus.fromList(it)
}
}
213.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
SyncIncomingTab.fromList(it)
SyncAccountInfo.fromList(it)
}
}
214.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
SyncRemoteTab.fromList(it)
SyncDevice.fromList(it)
}
}
215.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
SyncDeviceTabs.fromList(it)
SyncIncomingTab.fromList(it)
}
}
216.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
GeckoPref.fromList(it)
SyncRemoteTab.fromList(it)
}
}
217.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
MlProgressData.fromList(it)
SyncDeviceTabs.fromList(it)
}
}
218.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ContainerSiteAssignment.fromList(it)
GeckoPref.fromList(it)
}
}
219.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
GeckoHeader.fromList(it)
MlProgressData.fromList(it)
}
}
220.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
GeckoFetchRequest.fromList(it)
ContainerSiteAssignment.fromList(it)
}
}
221.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
GeckoFetchResponse.fromList(it)
GeckoHeader.fromList(it)
}
}
222.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
BookmarkNode.fromList(it)
GeckoFetchRequest.fromList(it)
}
}
223.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
BookmarkInfo.fromList(it)
GeckoFetchResponse.fromList(it)
}
}
224.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
SitePermissions.fromList(it)
BookmarkNode.fromList(it)
}
}
225.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
TrackingProtectionException.fromList(it)
BookmarkInfo.fromList(it)
}
}
226.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
PwaIcon.fromList(it)
SitePermissions.fromList(it)
}
}
227.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ShareTargetFiles.fromList(it)
TrackingProtectionException.fromList(it)
}
}
228.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ShareTargetParams.fromList(it)
PwaIcon.fromList(it)
}
}
229.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ShareTarget.fromList(it)
ShareTargetFiles.fromList(it)
}
}
230.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ExternalApplicationResource.fromList(it)
ShareTargetParams.fromList(it)
}
}
231.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ShareTarget.fromList(it)
}
}
232.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
ExternalApplicationResource.fromList(it)
}
}
233.toByte() -> {
return (readValue(buffer) as? List<Any?>)?.let {
PwaManifest.fromList(it)
}
@@ -4447,194 +4528,202 @@ private open class GeckoPigeonCodec : StandardMessageCodec() {
stream.write(184)
writeValue(stream, value.toList())
}
is HistoryItem -> {
is HistoryHighlightWeights -> {
stream.write(185)
writeValue(stream, value.toList())
}
is HistoryState -> {
is HistoryHighlight -> {
stream.write(186)
writeValue(stream, value.toList())
}
is ReaderableState -> {
is HistoryItem -> {
stream.write(187)
writeValue(stream, value.toList())
}
is SecurityInfoState -> {
is HistoryState -> {
stream.write(188)
writeValue(stream, value.toList())
}
is TabContentState -> {
is ReaderableState -> {
stream.write(189)
writeValue(stream, value.toList())
}
is FindResultState -> {
is SecurityInfoState -> {
stream.write(190)
writeValue(stream, value.toList())
}
is CustomSelectionAction -> {
is TabContentState -> {
stream.write(191)
writeValue(stream, value.toList())
}
is WebExtensionData -> {
is FindResultState -> {
stream.write(192)
writeValue(stream, value.toList())
}
is GeckoSuggestion -> {
is CustomSelectionAction -> {
stream.write(193)
writeValue(stream, value.toList())
}
is TabContent -> {
is WebExtensionData -> {
stream.write(194)
writeValue(stream, value.toList())
}
is ContentBlocking -> {
is GeckoSuggestion -> {
stream.write(195)
writeValue(stream, value.toList())
}
is DohSettings -> {
is TabContent -> {
stream.write(196)
writeValue(stream, value.toList())
}
is GeckoEngineSettings -> {
is ContentBlocking -> {
stream.write(197)
writeValue(stream, value.toList())
}
is AutocompleteResult -> {
is DohSettings -> {
stream.write(198)
writeValue(stream, value.toList())
}
is UnknownHitResult -> {
is GeckoEngineSettings -> {
stream.write(199)
writeValue(stream, value.toList())
}
is ImageHitResult -> {
is AutocompleteResult -> {
stream.write(200)
writeValue(stream, value.toList())
}
is VideoHitResult -> {
is UnknownHitResult -> {
stream.write(201)
writeValue(stream, value.toList())
}
is AudioHitResult -> {
is ImageHitResult -> {
stream.write(202)
writeValue(stream, value.toList())
}
is ImageSrcHitResult -> {
is VideoHitResult -> {
stream.write(203)
writeValue(stream, value.toList())
}
is PhoneHitResult -> {
is AudioHitResult -> {
stream.write(204)
writeValue(stream, value.toList())
}
is EmailHitResult -> {
is ImageSrcHitResult -> {
stream.write(205)
writeValue(stream, value.toList())
}
is GeoHitResult -> {
is PhoneHitResult -> {
stream.write(206)
writeValue(stream, value.toList())
}
is DownloadState -> {
is EmailHitResult -> {
stream.write(207)
writeValue(stream, value.toList())
}
is ShareInternetResourceState -> {
is GeoHitResult -> {
stream.write(208)
writeValue(stream, value.toList())
}
is AddonCollection -> {
is DownloadState -> {
stream.write(209)
writeValue(stream, value.toList())
}
is SyncEngineStatus -> {
is ShareInternetResourceState -> {
stream.write(210)
writeValue(stream, value.toList())
}
is SyncAccountInfo -> {
is AddonCollection -> {
stream.write(211)
writeValue(stream, value.toList())
}
is SyncDevice -> {
is SyncEngineStatus -> {
stream.write(212)
writeValue(stream, value.toList())
}
is SyncIncomingTab -> {
is SyncAccountInfo -> {
stream.write(213)
writeValue(stream, value.toList())
}
is SyncRemoteTab -> {
is SyncDevice -> {
stream.write(214)
writeValue(stream, value.toList())
}
is SyncDeviceTabs -> {
is SyncIncomingTab -> {
stream.write(215)
writeValue(stream, value.toList())
}
is GeckoPref -> {
is SyncRemoteTab -> {
stream.write(216)
writeValue(stream, value.toList())
}
is MlProgressData -> {
is SyncDeviceTabs -> {
stream.write(217)
writeValue(stream, value.toList())
}
is ContainerSiteAssignment -> {
is GeckoPref -> {
stream.write(218)
writeValue(stream, value.toList())
}
is GeckoHeader -> {
is MlProgressData -> {
stream.write(219)
writeValue(stream, value.toList())
}
is GeckoFetchRequest -> {
is ContainerSiteAssignment -> {
stream.write(220)
writeValue(stream, value.toList())
}
is GeckoFetchResponse -> {
is GeckoHeader -> {
stream.write(221)
writeValue(stream, value.toList())
}
is BookmarkNode -> {
is GeckoFetchRequest -> {
stream.write(222)
writeValue(stream, value.toList())
}
is BookmarkInfo -> {
is GeckoFetchResponse -> {
stream.write(223)
writeValue(stream, value.toList())
}
is SitePermissions -> {
is BookmarkNode -> {
stream.write(224)
writeValue(stream, value.toList())
}
is TrackingProtectionException -> {
is BookmarkInfo -> {
stream.write(225)
writeValue(stream, value.toList())
}
is PwaIcon -> {
is SitePermissions -> {
stream.write(226)
writeValue(stream, value.toList())
}
is ShareTargetFiles -> {
is TrackingProtectionException -> {
stream.write(227)
writeValue(stream, value.toList())
}
is ShareTargetParams -> {
is PwaIcon -> {
stream.write(228)
writeValue(stream, value.toList())
}
is ShareTarget -> {
is ShareTargetFiles -> {
stream.write(229)
writeValue(stream, value.toList())
}
is ExternalApplicationResource -> {
is ShareTargetParams -> {
stream.write(230)
writeValue(stream, value.toList())
}
is PwaManifest -> {
is ShareTarget -> {
stream.write(231)
writeValue(stream, value.toList())
}
is ExternalApplicationResource -> {
stream.write(232)
writeValue(stream, value.toList())
}
is PwaManifest -> {
stream.write(233)
writeValue(stream, value.toList())
}
else -> super.writeValue(stream, value)
}
}
@@ -7531,6 +7620,7 @@ interface GeckoHistoryApi {
fun deleteVisit(url: String, timestamp: Long, callback: (Result<Unit>) -> Unit)
fun deleteDownload(id: String, callback: (Result<Unit>) -> Unit)
fun deleteVisitsBetween(startMillis: Long, endMillis: Long, callback: (Result<Unit>) -> Unit)
fun getHistoryHighlights(weights: HistoryHighlightWeights, limit: Long, callback: (Result<List<HistoryHighlight>>) -> Unit)
companion object {
/** The codec used by GeckoHistoryApi. */
@@ -7644,6 +7734,27 @@ interface GeckoHistoryApi {
channel.setMessageHandler(null)
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.flutter_mozilla_components.GeckoHistoryApi.getHistoryHighlights$separatedMessageChannelSuffix", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
val weightsArg = args[0] as HistoryHighlightWeights
val limitArg = args[1] as Long
api.getHistoryHighlights(weightsArg, limitArg) { result: Result<List<HistoryHighlight>> ->
val error = result.exceptionOrNull()
if (error != null) {
reply.reply(GeckoPigeonUtils.wrapError(error))
} else {
val data = result.getOrNull()
reply.reply(GeckoPigeonUtils.wrapResult(data))
}
}
}
} else {
channel.setMessageHandler(null)
}
}
}
}
}
packages/flutter_mozilla_components/lib/flutter_mozilla_components.dart
+2
View File
@@ -65,6 +65,8 @@ export 'src/pigeons/gecko.g.dart'
GeckoSuggestionType,
GeckoTrackingProtectionApi,
GeoHitResult,
HistoryHighlight,
HistoryHighlightWeights,
HistoryMetadataKey,
HitResult,
HttpsOnlyMode,
packages/flutter_mozilla_components/lib/src/domain/services/gecko_event.dart
+1 -2
View File
@@ -48,8 +48,7 @@ class GeckoEventService extends GeckoStateEvents {
final _tabAddedSubject = PublishSubject<String>();
final _mlProgressSubject = PublishSubject<MlProgressData>();
final _manifestUpdateSubject = PublishSubject<ManifestUpdateEvent>();
final _translationEngineSubject =
BehaviorSubject<TranslationEngineEvent>();
final _translationEngineSubject = BehaviorSubject<TranslationEngineEvent>();
final _tabTranslationSubject = ReplaySubject<TabTranslationEvent>();
// Event streams
packages/flutter_mozilla_components/lib/src/domain/services/gecko_history.dart
+7
View File
@@ -60,4 +60,11 @@ class GeckoHistoryService {
end.millisecondsSinceEpoch,
);
}
Future<List<HistoryHighlight>> getHistoryHighlights({
required HistoryHighlightWeights weights,
required int limit,
}) {
return _api.getHistoryHighlights(weights, limit);
}
}
packages/flutter_mozilla_components/lib/src/pigeons/gecko.g.dart
+2693 -1727
View File
File diff suppressed because it is too large Load Diff
packages/flutter_mozilla_components/pigeons/gecko.dart
+30 -4
View File
@@ -534,6 +534,29 @@ class VisitInfo {
);
}
class HistoryHighlightWeights {
final double viewTime;
final double frequency;
HistoryHighlightWeights(this.viewTime, this.frequency);
}
class HistoryHighlight {
final double score;
final int placeId;
final String url;
final String? title;
final String? previewImageUrl;
HistoryHighlight(
this.score,
this.placeId,
this.url,
this.title,
this.previewImageUrl,
);
}
class HistoryItem {
final String url;
final String title;
@@ -1639,10 +1662,7 @@ abstract class GeckoStateEvents {
int sequence,
TranslationEngineStateData state,
);
void onTabTranslationStateChange(
int sequence,
TabTranslationStateData state,
);
void onTabTranslationStateChange(int sequence, TabTranslationStateData state);
}
@FlutterApi()
@@ -1797,6 +1817,12 @@ abstract class GeckoHistoryApi {
@async
void deleteVisitsBetween(int startMillis, int endMillis);
@async
List<HistoryHighlight> getHistoryHighlights(
HistoryHighlightWeights weights,
int limit,
);
}
@HostApi()