diff --git a/app/src/main/java/org/mozilla/fenix/components/history/PagedHistoryProvider.kt b/app/src/main/java/org/mozilla/fenix/components/history/PagedHistoryProvider.kt index eb78ff0915..fb17eebbcb 100644 --- a/app/src/main/java/org/mozilla/fenix/components/history/PagedHistoryProvider.kt +++ b/app/src/main/java/org/mozilla/fenix/components/history/PagedHistoryProvider.kt @@ -37,6 +37,18 @@ class DefaultPagedHistoryProvider( private val historyStorage: PlacesHistoryStorage, private val showHistorySearchGroups: Boolean = FeatureFlags.showHistorySearchGroups, ) : PagedHistoryProvider { + /** + * Types of visits we currently do not display in the History UI. + */ + private val excludedVisitTypes = listOf( + VisitType.NOT_A_VISIT, + VisitType.DOWNLOAD, + VisitType.REDIRECT_PERMANENT, + VisitType.REDIRECT_TEMPORARY, + VisitType.RELOAD, + VisitType.EMBED, + VisitType.FRAMED_LINK, + ) @Volatile private var historyGroups: List? = null @@ -75,15 +87,7 @@ class DefaultPagedHistoryProvider( .getVisitsPaginated( offset, numberOfItems, - excludeTypes = listOf( - VisitType.NOT_A_VISIT, - VisitType.DOWNLOAD, - VisitType.REDIRECT_TEMPORARY, - VisitType.RELOAD, - VisitType.EMBED, - VisitType.FRAMED_LINK, - VisitType.REDIRECT_PERMANENT - ) + excludeTypes = excludedVisitTypes ) .mapIndexed(transformVisitInfoToHistoryItem(offset.toInt())) } @@ -102,15 +106,7 @@ class DefaultPagedHistoryProvider( val history = historyStorage.getDetailedVisits( start = historyMetadata.visitedAt - BUFFER_TIME, end = historyMetadata.visitedAt + BUFFER_TIME, - excludeTypes = listOf( - VisitType.NOT_A_VISIT, - VisitType.DOWNLOAD, - VisitType.REDIRECT_TEMPORARY, - VisitType.RELOAD, - VisitType.EMBED, - VisitType.FRAMED_LINK, - VisitType.REDIRECT_PERMANENT - ) + excludeTypes = excludedVisitTypes ) return history .filter { it.url == historyMetadata.url } @@ -134,15 +130,7 @@ class DefaultPagedHistoryProvider( .getVisitsPaginated( offset, numberOfItems, - excludeTypes = listOf( - VisitType.NOT_A_VISIT, - VisitType.DOWNLOAD, - VisitType.REDIRECT_TEMPORARY, - VisitType.RELOAD, - VisitType.EMBED, - VisitType.FRAMED_LINK, - VisitType.REDIRECT_PERMANENT - ) + excludeTypes = excludedVisitTypes ) .mapIndexed(transformVisitInfoToHistoryItem(offset.toInt())) diff --git a/app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt b/app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt index 5b04b16b39..2b22481998 100644 --- a/app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt @@ -103,11 +103,11 @@ class PagedHistoryProviderTest { excludeTypes = listOf( VisitType.NOT_A_VISIT, VisitType.DOWNLOAD, + VisitType.REDIRECT_PERMANENT, VisitType.REDIRECT_TEMPORARY, VisitType.RELOAD, VisitType.EMBED, VisitType.FRAMED_LINK, - VisitType.REDIRECT_PERMANENT ) ) } @@ -189,11 +189,11 @@ class PagedHistoryProviderTest { excludeTypes = listOf( VisitType.NOT_A_VISIT, VisitType.DOWNLOAD, + VisitType.REDIRECT_PERMANENT, VisitType.REDIRECT_TEMPORARY, VisitType.RELOAD, VisitType.EMBED, VisitType.FRAMED_LINK, - VisitType.REDIRECT_PERMANENT ) ) } @@ -262,11 +262,11 @@ class PagedHistoryProviderTest { excludeTypes = listOf( VisitType.NOT_A_VISIT, VisitType.DOWNLOAD, + VisitType.REDIRECT_PERMANENT, VisitType.REDIRECT_TEMPORARY, VisitType.RELOAD, VisitType.EMBED, VisitType.FRAMED_LINK, - VisitType.REDIRECT_PERMANENT ) ) }