ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix mapping between history visits and groups to use createdAt 

We currently have a 15s buffer to match metadata to its corresponding
visit. However, a existing metadata record can be updated more than
15s after it was created e.g. when closing the tab and updating
the view time.
This commit is contained in:
Christian Sadilek 2021-09-23 16:01:59 -04:00 committed by mergify[bot]
parent 1418d3f2bd
commit 54549c49ec
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/mozilla/fenix/components/history/PagedHistoryProvider.kt
View File

@ -54,13 +54,14 @@ class DefaultPagedHistoryProvider(
if (historyGroups == null || offset == 0L) {
historyGroups = historyStorage.getHistoryMetadataSince(Long.MIN_VALUE)
.sortedByDescending { it.createdAt }
.filter { it.key.searchTerm != null }
.groupBy { it.key.searchTerm!! }
.map { (searchTerm, items) ->
History.Group(
id = items.first().createdAt.toInt(),
title = searchTerm,
visitedAt = items.first().updatedAt,
visitedAt = items.first().createdAt,
items = items.map { it.toHistoryMetadata() }
)
}

19
app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt
View File

@ -57,7 +57,7 @@ class PagedHistoryProviderTest {
key = historyMetadataKey1,
title = "mozilla",
createdAt = 5,
updatedAt = 5,
updatedAt = 10,
totalViewTime = 10,
documentType = DocumentType.Regular,
previewImageUrl = null
@ -67,19 +67,19 @@ class PagedHistoryProviderTest {
key = historyMetadataKey2,
title = "firefox",
createdAt = 2,
updatedAt = 2,
updatedAt = 11,
totalViewTime = 20,
documentType = DocumentType.Regular,
previewImageUrl = null
)
// Adding a third entry with same url to test deduping
// Adding a third entry with same url to test de-duping
val historyMetadataKey3 = HistoryMetadataKey("http://www.firefox.com", "mozilla", null)
val historyEntry3 = HistoryMetadata(
key = historyMetadataKey3,
title = "firefox",
createdAt = 3,
updatedAt = 3,
updatedAt = 12,
totalViewTime = 30,
documentType = DocumentType.Regular,
previewImageUrl = null
@ -114,6 +114,7 @@ class PagedHistoryProviderTest {
id = historyEntry1.createdAt.toInt(),
title = historyEntry1.key.searchTerm!!,
visitedAt = historyEntry1.createdAt,
// Results are de-duped by URL and sorted descending by createdAt/visitedAt
items = listOf(
History.Metadata(
id = historyEntry1.createdAt.toInt(),
@ -124,11 +125,11 @@ class PagedHistoryProviderTest {
historyMetadataKey = historyMetadataKey1
),
History.Metadata(
id = historyEntry2.createdAt.toInt(),
title = historyEntry2.title!!,
url = historyEntry2.key.url,
visitedAt = historyEntry2.createdAt,
totalViewTime = historyEntry2.totalViewTime,
id = historyEntry3.createdAt.toInt(),
title = historyEntry3.title!!,
url = historyEntry3.key.url,
visitedAt = historyEntry3.createdAt,
totalViewTime = historyEntry3.totalViewTime,
historyMetadataKey = historyMetadataKey2
)
)