From aa7283def9ee9745448592a76fe09ffd16640dcf Mon Sep 17 00:00:00 2001 From: Mugurell Date: Wed, 26 Aug 2020 18:03:23 +0300 Subject: [PATCH] For #12980 - Unify deleteBrowsingData() and deleteHistoryAndDOMStorages() The two methods are serving the same purpose, with one calling the other. This prepares the ground for adding a method to delete icons in only one place and remove confusion about what that place should be. --- .../fenix/settings/deletebrowsingdata/DeleteAndQuit.kt | 2 +- .../deletebrowsingdata/DeleteBrowsingDataController.kt | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuit.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuit.kt index b4cf23018..63b7e14c9 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuit.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuit.kt @@ -53,7 +53,7 @@ fun deleteAndQuit(activity: Activity, coroutineScope: CoroutineScope, snackbar: private suspend fun DeleteBrowsingDataController.deleteType(type: DeleteBrowsingDataOnQuitType) { when (type) { DeleteBrowsingDataOnQuitType.TABS -> deleteTabs() - DeleteBrowsingDataOnQuitType.HISTORY -> deleteHistoryAndDOMStorages() + DeleteBrowsingDataOnQuitType.HISTORY -> deleteBrowsingData() DeleteBrowsingDataOnQuitType.COOKIES -> deleteCookies() DeleteBrowsingDataOnQuitType.CACHE -> deleteCachedFiles() DeleteBrowsingDataOnQuitType.PERMISSIONS -> withContext(IO) { diff --git a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt index b8894cc49..200244cb8 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataController.kt @@ -15,7 +15,6 @@ import kotlin.coroutines.CoroutineContext interface DeleteBrowsingDataController { suspend fun deleteTabs() suspend fun deleteBrowsingData() - suspend fun deleteHistoryAndDOMStorages() suspend fun deleteCookies() suspend fun deleteCachedFiles() suspend fun deleteSitePermissions() @@ -36,14 +35,10 @@ class DefaultDeleteBrowsingDataController( } override suspend fun deleteBrowsingData() { - deleteHistoryAndDOMStorages() - } - - override suspend fun deleteHistoryAndDOMStorages() { withContext(coroutineContext) { engine.clearData(Engine.BrowsingData.select(Engine.BrowsingData.DOM_STORAGES)) + historyStorage.deleteEverything() } - historyStorage.deleteEverything() } override suspend fun deleteCookies() {