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 08905fdb8..442929ca6 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 @@ -6,10 +6,8 @@ package org.mozilla.fenix.settings.deletebrowsingdata import android.content.Context import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay import kotlinx.coroutines.withContext import mozilla.components.concept.engine.Engine -import mozilla.components.feature.tab.collections.TabCollection import org.mozilla.fenix.ext.components import kotlin.coroutines.CoroutineContext @@ -17,7 +15,6 @@ interface DeleteBrowsingDataController { suspend fun deleteTabs() suspend fun deleteBrowsingData() suspend fun deleteHistoryAndDOMStorages() - suspend fun deleteCollections(collections: List) suspend fun deleteCookies() suspend fun deleteCachedFiles() suspend fun deleteSitePermissions() @@ -45,14 +42,6 @@ class DefaultDeleteBrowsingDataController( context.components.core.historyStorage.deleteEverything() } - override suspend fun deleteCollections(collections: List) { - while (context.components.core.tabCollectionStorage.getTabCollectionsCount() != collections.size) { - delay(DELAY_IN_MILLIS) - } - - collections.forEach { context.components.core.tabCollectionStorage.removeCollection(it) } - } - override suspend fun deleteCookies() { withContext(coroutineContext) { context.components.core.engine.clearData( @@ -80,8 +69,4 @@ class DefaultDeleteBrowsingDataController( } context.components.core.permissionStorage.deleteAllSitePermissions() } - - companion object { - private const val DELAY_IN_MILLIS = 500L - } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt index 814f75879..1165e6bef 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt @@ -9,7 +9,6 @@ import android.os.Bundle import android.view.View import androidx.appcompat.app.AlertDialog import androidx.fragment.app.Fragment -import androidx.lifecycle.Observer import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import kotlinx.android.synthetic.main.fragment_delete_browsing_data.* @@ -18,7 +17,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import mozilla.components.browser.session.Session import mozilla.components.browser.session.SessionManager -import mozilla.components.feature.tab.collections.TabCollection import org.mozilla.fenix.R import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.metrics.Event @@ -28,7 +26,6 @@ import org.mozilla.fenix.ext.showToolbar @SuppressWarnings("TooManyFunctions") class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_data) { private lateinit var sessionObserver: SessionManager.Observer - private var tabCollections: List = listOf() private lateinit var controller: DeleteBrowsingDataController override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -45,12 +42,6 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da } requireComponents.core.sessionManager.register(sessionObserver, owner = this) - requireComponents.core.tabCollectionStorage.apply { - getCollections().observe(this@DeleteBrowsingDataFragment, Observer { - this@DeleteBrowsingDataFragment.tabCollections = it - }) - } - getCheckboxes().forEach { it.onCheckListener = { _ -> updateDeleteButton() } } @@ -111,7 +102,6 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da when (i) { OPEN_TABS_INDEX -> controller.deleteTabs() HISTORY_INDEX -> controller.deleteBrowsingData() - COLLECTIONS_INDEX -> controller.deleteCollections(tabCollections) COOKIES_INDEX -> controller.deleteCookies() CACHED_INDEX -> controller.deleteCachedFiles() PERMS_INDEX -> controller.deleteSitePermissions() @@ -165,7 +155,6 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da private fun updateItemCounts() { updateTabCount() updateHistoryCount() - updateCollectionsCount() updateCookies() updateCachedImagesAndFiles() updateSitePermissions() @@ -198,24 +187,6 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da } } - private fun updateCollectionsCount() { - view?.browsing_data_item?.subtitleView?.text = "" - - viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) { - val collectionsCount = - requireComponents.core.tabCollectionStorage.getTabCollectionsCount() - launch(Dispatchers.Main) { - view?.collections_item?.apply { - subtitleView.text = - resources.getString( - R.string.preferences_delete_browsing_data_collections_subtitle, - collectionsCount - ) - } - } - } - } - private fun updateCookies() { // NO OP until we have GeckoView methods to count cookies } @@ -233,12 +204,12 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da return listOf( fragmentView.open_tabs_item, fragmentView.browsing_data_item, - fragmentView.collections_item, fragmentView.cookies_item, fragmentView.cached_files_item, fragmentView.site_permissions_item ) } + // If coming from Open Tab -> Settings, pop back to Home // If coming from Home -> Settings, pop back to Settings private fun returnToDeletionOrigin() { @@ -286,9 +257,8 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da private const val OPEN_TABS_INDEX = 0 private const val HISTORY_INDEX = 1 - private const val COLLECTIONS_INDEX = 2 - private const val COOKIES_INDEX = 3 - private const val CACHED_INDEX = 4 - private const val PERMS_INDEX = 5 + private const val COOKIES_INDEX = 2 + private const val CACHED_INDEX = 3 + private const val PERMS_INDEX = 4 } } diff --git a/app/src/main/res/layout/fragment_delete_browsing_data.xml b/app/src/main/res/layout/fragment_delete_browsing_data.xml index a795757e4..42f356521 100644 --- a/app/src/main/res/layout/fragment_delete_browsing_data.xml +++ b/app/src/main/res/layout/fragment_delete_browsing_data.xml @@ -51,17 +51,6 @@ android:focusable="true" app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_browsing_data_title" app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_browsing_data_subtitle" /> - %d pàgines - - Col·leccions - - %d col·leccions Galetes diff --git a/app/src/main/res/values-co/strings.xml b/app/src/main/res/values-co/strings.xml index 58028900a..f878476aa 100644 --- a/app/src/main/res/values-co/strings.xml +++ b/app/src/main/res/values-co/strings.xml @@ -752,11 +752,6 @@ %d pagine - - Cullezzioni - - %d cullezzioni Canistrelli diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 40f00de07..7ea96448c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -774,11 +774,6 @@ Počet stránek: %d - - Sbírky - - Počet sbírek: %d Cookies diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 2ae286349..f44ac9918 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -748,11 +748,6 @@ %d tudalen - - Casgliadau - - %d casgliad Cwcis diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6b7ff8e4e..9740fb10a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -784,11 +784,6 @@ %d Seiten - - Sammlungen - - %d Sammlungen Cookies diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml index 764bab46f..21335c8f0 100644 --- a/app/src/main/res/values-es-rAR/strings.xml +++ b/app/src/main/res/values-es-rAR/strings.xml @@ -774,11 +774,6 @@ %d páginas - - Colecciones - - %d colecciones Cookies diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 64d322e33..95d6a2382 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -784,11 +784,6 @@ %d páginas - - Colecciones - - %d colecciones Cookies diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3ca5ff3a0..b6bc29e9d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -712,11 +712,6 @@ %d páginas - - Colecciones - - %d colecciones Cookies diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index a5399d46e..078a25a93 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -762,11 +762,6 @@ %d orri - - Bildumak - - %d bilduma Cookieak diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 38b392a30..2afe2727c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -766,11 +766,6 @@ %d sivua - - Kokoelmat - - %d kokoelmaa Evästeet diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 604f6280d..ce73cca5c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -784,11 +784,6 @@ %d pages - - Collections - - %d collections Cookies diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml index 346894905..f5cf6df22 100644 --- a/app/src/main/res/values-fy-rNL/strings.xml +++ b/app/src/main/res/values-fy-rNL/strings.xml @@ -750,11 +750,6 @@ %d siden - - Kolleksjes - - %d kolleksjes Cookies diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 27ad4c982..4042801fc 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -759,11 +759,6 @@ %d lap - - Gyűjtemények - - %d gyűjtemény Sütik diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6cc01c787..6106b4265 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -771,12 +771,6 @@ %d laman - - Koleksi - - %d koleksi - Kuki diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c2593aea7..dfd27d68d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -787,11 +787,6 @@ %d pagine - - Raccolte - - %d raccolte Cookie diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index f0028491d..cbcec3e82 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -638,11 +638,6 @@ %d דפים - - אוספים - - %d אוספים עוגיות diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ea29eda05..ef99c2bf2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -760,11 +760,6 @@ %d ページ - - コレクション - - %d 件のコレクション Cookie diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index c778e8145..f5b41813f 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -757,11 +757,6 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara Isebtar %d - - Tigrummiwin - - Tigrummiwin %d Inagan n tuqqna diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 1167adf62..467dc7706 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -664,11 +664,6 @@ %d 주소 방문 기록 - - 컬렉션 - - %d개 컬랙션 쿠키 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d9dba9d9c..0e1f7b2ee 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -763,11 +763,6 @@ %d pagina’s - - Collecties - - %d collecties Cookies diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml index 0ecd0cad5..943a2b5a2 100644 --- a/app/src/main/res/values-pa-rIN/strings.xml +++ b/app/src/main/res/values-pa-rIN/strings.xml @@ -766,11 +766,6 @@ %d ਸਫ਼ੇ - - ਭੰਡਾਰ - - %d ਭੰਡਾਰ ਕੂਕੀਜ਼ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index d456bf971..c38c22b34 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -760,11 +760,6 @@ Strony: %d - - Kolekcje - - Kolekcje: %d Ciasteczka diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4b752df33..0f6ac811f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -784,11 +784,6 @@ %d страницу(ы) - - Коллекции - - %d коллекций Куки diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 04f779dbf..2c9076449 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -765,11 +765,6 @@ Počet stránok: %d - - Kolekcie - - Počet kolekcií: %d Cookies diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 344990cb5..1185b29ad 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -765,12 +765,6 @@ %d sidor - - Samlingar - - %d samlingar - Kakor diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f9d9ff85b..754dc0f3f 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -750,11 +750,6 @@ %d sayfa - - Koleksiyonlar - - %d koleksiyon Çerezler diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f72cc0105..0aaba1d54 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -790,11 +790,6 @@ %d 页 - - 收藏集 - - %d 个收藏集 Cookie diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f0622b901..a7e8598ca 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -783,11 +783,6 @@ %d 頁 - - 收藏集 - - %d 個收藏集 Cookie diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c47148845..6a0af0d4d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -747,11 +747,6 @@ %d pages - - Collections - - %d collections Cookies diff --git a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt index 127c25d74..985b1a079 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt @@ -19,7 +19,6 @@ import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.runBlockingTest import kotlinx.coroutines.test.setMain import mozilla.components.concept.engine.Engine -import mozilla.components.feature.tab.collections.TabCollection import org.junit.After import org.junit.Before import org.junit.Test @@ -77,20 +76,6 @@ class DefaultDeleteBrowsingDataControllerTest { } } - @Test - fun deleteCollections() = runBlockingTest { - controller = DefaultDeleteBrowsingDataController(context, coroutineContext) - - val collections: List = listOf(mockk(relaxed = true)) - every { context.components.core.tabCollectionStorage.getTabCollectionsCount() } returns 1 - - controller.deleteCollections(collections) - - verify { - context.components.core.tabCollectionStorage.removeCollection(collections[0]) - } - } - @Test fun deleteCookies() = runBlockingTest { controller = DefaultDeleteBrowsingDataController(context, coroutineContext)