Issue #8324: Delete the pinned site from the history when removing (5368e347) · Commits · The Tor Project / Applications / android-components

components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/DefaultTopSitesStorage.kt

+7 −5

Original line number	Diff line number	Diff line
		@@ -53,13 +53,15 @@ class DefaultTopSitesStorage(

		override fun removeTopSite(topSite: TopSite) {
		scope.launch {
		if (topSite.type == FRECENT) {
		historyStorage.deleteVisitsFor(topSite.url)
		notifyObservers { onStorageUpdated() }
		} else {
		if (topSite.type != FRECENT) {
		pinnedSitesStorage.removePinnedSite(topSite)
		notifyObservers { onStorageUpdated() }
		}

		// Remove the top site from both history and pinned sites storage to avoid having it
		// show up as a frecent site if it is a pinned site.
		historyStorage.deleteVisitsFor(topSite.url)

		notifyObservers { onStorageUpdated() }
		}
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ class DefaultTopSitesStorageTest {
		defaultTopSitesStorage.removeTopSite(pinnedSite)

		verify(pinnedSitesStorage).removePinnedSite(pinnedSite)
		verify(historyStorage).deleteVisitsFor(pinnedSite.url)

		val defaultSite = TopSite(
		id = 3,
		@@ -101,6 +102,7 @@ class DefaultTopSitesStorageTest {
		defaultTopSitesStorage.removeTopSite(defaultSite)

		verify(pinnedSitesStorage).removePinnedSite(defaultSite)
		verify(historyStorage).deleteVisitsFor(defaultSite.url)
		}

		@Test