From ac359f6970eab4ec917e44d5f0c579be401eff0d Mon Sep 17 00:00:00 2001
From: James Hugman <james@hugman.tv>
Date: Wed, 17 Jul 2019 18:24:01 +0100
Subject: [PATCH] Closes #1331 - Filter consecutive history items using
 simplified URL

---
 .../main/java/org/mozilla/fenix/ext/String.kt   | 17 +++++++++++++++++
 .../fenix/library/history/HistoryFragment.kt    |  9 +++++++++
 2 files changed, 26 insertions(+)

diff --git a/app/src/main/java/org/mozilla/fenix/ext/String.kt b/app/src/main/java/org/mozilla/fenix/ext/String.kt
index cb8e310b1..dab11c3ac 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/String.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/String.kt
@@ -43,3 +43,20 @@ fun String.urlToTrimmedHost(context: Context): String {
         this
     }
 }
+
+/**
+ * Trims a URL string of its scheme and common prefixes.
+ *
+ * This is intended to act much like [PublicSuffixList.getPublicSuffixPlusOne()] but unlike
+ * that method, leaves the path, anchor, etc intact.
+ *
+ */
+fun String.simplifiedUrl(): String {
+    val afterScheme = this.substringAfter("://")
+    for (prefix in listOf("www.", "m.", "mobile.")) {
+        if (afterScheme.startsWith(prefix)) {
+            return afterScheme.substring(prefix.length)
+        }
+    }
+    return afterScheme
+}
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
index a1dc78678..37d0f9c35 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
@@ -39,6 +39,7 @@ import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getHostFromUrl
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.requireComponents
+import org.mozilla.fenix.ext.simplifiedUrl
 import org.mozilla.fenix.share.ShareTab
 import java.util.concurrent.TimeUnit
 
@@ -256,12 +257,20 @@ class HistoryFragment : Fragment(), BackHandler {
         // Until we have proper pagination, only display a limited set of history to avoid blowing up the UI.
         // See https://github.com/mozilla-mobile/fenix/issues/1393
         val sinceTimeMs = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(HISTORY_TIME_DAYS)
+        var previous: String? = null
+
         val items = requireComponents.core.historyStorage
             .getDetailedVisits(sinceTimeMs, excludeTypes = excludeTypes)
             // We potentially have a large amount of visits, and multiple processing steps.
             // Wrapping iterator in a sequence should make this a little memory-more efficient.
             .asSequence()
             .sortedByDescending { it.visitTime }
+            .filter {
+                val current = it.url.simplifiedUrl()
+                val isNotDuplicate = current != previous
+                previous = current
+                isNotDuplicate
+            }
             .mapIndexed { id, item ->
                 val title = item.title
                     ?.takeIf(String::isNotEmpty)