diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataOnQuitTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataOnQuitTest.kt index 1f8997236..57ce9115a 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataOnQuitTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataOnQuitTest.kt @@ -120,7 +120,35 @@ class ComposeSettingsDeleteBrowsingDataOnQuitTest { } @Test - fun deleteHistoryAndSiteStorageOnQuitTest() { + fun deleteHistoryOnQuitTest() { + val genericPage = + getStorageTestAsset(mockWebServer, "generic1.html") + + homeScreen { + }.openThreeDotMenu { + }.openSettings { + }.openSettingsSubMenuDeleteBrowsingDataOnQuit { + clickDeleteBrowsingOnQuitButtonSwitch() + exitMenu() + } + navigationToolbar { + }.enterURLAndEnterToBrowser(genericPage.url) { + }.goToHomescreen { + }.openThreeDotMenu { + clickQuit() + restartApp(composeTestRule.activityRule) + } + + homeScreen { + }.openThreeDotMenu { + }.openHistory { + verifyEmptyHistoryView() + exitMenu() + } + } + + @Test + fun deleteCookiesAndSiteDataOnQuitTest() { val storageWritePage = getStorageTestAsset(mockWebServer, "storage_write.html") val storageCheckPage = @@ -143,12 +171,6 @@ class ComposeSettingsDeleteBrowsingDataOnQuitTest { restartApp(composeTestRule.activityRule) } - homeScreen { - }.openThreeDotMenu { - }.openHistory { - verifyEmptyHistoryView() - exitMenu() - } navigationToolbar { }.enterURLAndEnterToBrowser(storageCheckPage.url) { verifyPageContent("Session storage empty") diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataTest.kt index d9b2eacd3..78f777eaf 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSettingsDeleteBrowsingDataTest.kt @@ -167,20 +167,15 @@ class ComposeSettingsDeleteBrowsingDataTest { @SmokeTest @Test - fun deleteBrowsingHistoryAndSiteDataTest() { - val storageWritePage = getStorageTestAsset(mockWebServer, "storage_write.html").url - val storageCheckPage = getStorageTestAsset(mockWebServer, "storage_check.html").url + fun deleteBrowsingHistoryTest() { + val genericPage = getStorageTestAsset(mockWebServer, "generic1.html").url navigationToolbar { - }.enterURLAndEnterToBrowser(storageWritePage) { - }.openNavigationToolbar { - }.enterURLAndEnterToBrowser(storageCheckPage) { - verifyPageContent("Session storage has value") - verifyPageContent("Local storage has value") + }.enterURLAndEnterToBrowser(genericPage) { }.openThreeDotMenu { }.openSettings { }.openSettingsSubMenuDeleteBrowsingData { - verifyBrowsingHistoryDetails("2") + verifyBrowsingHistoryDetails("1") selectOnlyBrowsingHistoryCheckBox() clickDeleteBrowsingDataButton() verifyDeleteBrowsingDataDialog() @@ -198,27 +193,27 @@ class ComposeSettingsDeleteBrowsingDataTest { verifyEmptyHistoryView() mDevice.pressBack() } - navigationToolbar { - }.enterURLAndEnterToBrowser(storageCheckPage) { - verifyPageContent("Session storage empty") - verifyPageContent("Local storage empty") - } } @SmokeTest @Test - fun deleteCookiesTest() { + fun deleteCookiesAndSiteDataTest() { val genericPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val cookiesTestPage = getStorageTestAsset(mockWebServer, "storage_write.html").url + val storageWritePage = getStorageTestAsset(mockWebServer, "storage_write.html").url + val storageCheckPage = getStorageTestAsset(mockWebServer, "storage_check.html").url // Browsing a generic page to allow GV to load on a fresh run navigationToolbar { }.enterURLAndEnterToBrowser(genericPage.url) { }.openNavigationToolbar { - }.enterURLAndEnterToBrowser(cookiesTestPage) { + }.enterURLAndEnterToBrowser(storageWritePage) { verifyPageContent("No cookies set") clickPageObject(itemWithResId("setCookies")) verifyPageContent("user=android") + }.openNavigationToolbar { + }.enterURLAndEnterToBrowser(storageCheckPage) { + verifyPageContent("Session storage has value") + verifyPageContent("Local storage has value") }.openThreeDotMenu { }.openSettings { }.openSettingsSubMenuDeleteBrowsingData { @@ -228,9 +223,12 @@ class ComposeSettingsDeleteBrowsingDataTest { confirmDeletionAndAssertSnackbar() exitMenu() } - browserScreen { - }.openThreeDotMenu { - }.refreshPage { + navigationToolbar { + }.enterURLAndEnterToBrowser(storageCheckPage) { + verifyPageContent("Session storage empty") + verifyPageContent("Local storage empty") + }.openNavigationToolbar { + }.enterURLAndEnterToBrowser(storageWritePage) { verifyPageContent("No cookies set") } } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataOnQuitTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataOnQuitTest.kt index e528e0f2f..99d31bf07 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataOnQuitTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataOnQuitTest.kt @@ -113,7 +113,35 @@ class SettingsDeleteBrowsingDataOnQuitTest { } @Test - fun deleteHistoryAndSiteStorageOnQuitTest() { + fun deleteHistoryOnQuitTest() { + val genericPage = + getStorageTestAsset(mockWebServer, "generic1.html") + + homeScreen { + }.openThreeDotMenu { + }.openSettings { + }.openSettingsSubMenuDeleteBrowsingDataOnQuit { + clickDeleteBrowsingOnQuitButtonSwitch() + exitMenu() + } + navigationToolbar { + }.enterURLAndEnterToBrowser(genericPage.url) { + }.goToHomescreen { + }.openThreeDotMenu { + clickQuit() + restartApp(activityTestRule) + } + + homeScreen { + }.openThreeDotMenu { + }.openHistory { + verifyEmptyHistoryView() + exitMenu() + } + } + + @Test + fun deleteCookiesAndSiteDataOnQuitTest() { val storageWritePage = getStorageTestAsset(mockWebServer, "storage_write.html") val storageCheckPage = @@ -136,12 +164,6 @@ class SettingsDeleteBrowsingDataOnQuitTest { restartApp(activityTestRule) } - homeScreen { - }.openThreeDotMenu { - }.openHistory { - verifyEmptyHistoryView() - exitMenu() - } navigationToolbar { }.enterURLAndEnterToBrowser(storageCheckPage.url) { verifyPageContent("Session storage empty") diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataTest.kt index 92eb2693d..e36c7ecd6 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeleteBrowsingDataTest.kt @@ -160,20 +160,15 @@ class SettingsDeleteBrowsingDataTest { @SmokeTest @Test - fun deleteBrowsingHistoryAndSiteDataTest() { - val storageWritePage = getStorageTestAsset(mockWebServer, "storage_write.html").url - val storageCheckPage = getStorageTestAsset(mockWebServer, "storage_check.html").url + fun deleteBrowsingHistoryTest() { + val genericPage = getStorageTestAsset(mockWebServer, "generic1.html").url navigationToolbar { - }.enterURLAndEnterToBrowser(storageWritePage) { - }.openNavigationToolbar { - }.enterURLAndEnterToBrowser(storageCheckPage) { - verifyPageContent("Session storage has value") - verifyPageContent("Local storage has value") + }.enterURLAndEnterToBrowser(genericPage) { }.openThreeDotMenu { }.openSettings { }.openSettingsSubMenuDeleteBrowsingData { - verifyBrowsingHistoryDetails("2") + verifyBrowsingHistoryDetails("1") selectOnlyBrowsingHistoryCheckBox() clickDeleteBrowsingDataButton() verifyDeleteBrowsingDataDialog() @@ -191,27 +186,27 @@ class SettingsDeleteBrowsingDataTest { verifyEmptyHistoryView() mDevice.pressBack() } - navigationToolbar { - }.enterURLAndEnterToBrowser(storageCheckPage) { - verifyPageContent("Session storage empty") - verifyPageContent("Local storage empty") - } } @SmokeTest @Test - fun deleteCookiesTest() { + fun deleteCookiesAndSiteDataTest() { val genericPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) - val cookiesTestPage = getStorageTestAsset(mockWebServer, "storage_write.html").url + val storageWritePage = getStorageTestAsset(mockWebServer, "storage_write.html").url + val storageCheckPage = getStorageTestAsset(mockWebServer, "storage_check.html").url // Browsing a generic page to allow GV to load on a fresh run navigationToolbar { }.enterURLAndEnterToBrowser(genericPage.url) { }.openNavigationToolbar { - }.enterURLAndEnterToBrowser(cookiesTestPage) { + }.enterURLAndEnterToBrowser(storageWritePage) { verifyPageContent("No cookies set") clickPageObject(itemWithResId("setCookies")) verifyPageContent("user=android") + }.openNavigationToolbar { + }.enterURLAndEnterToBrowser(storageCheckPage) { + verifyPageContent("Session storage has value") + verifyPageContent("Local storage has value") }.openThreeDotMenu { }.openSettings { }.openSettingsSubMenuDeleteBrowsingData { @@ -221,9 +216,12 @@ class SettingsDeleteBrowsingDataTest { confirmDeletionAndAssertSnackbar() exitMenu() } - browserScreen { - }.openThreeDotMenu { - }.refreshPage { + navigationToolbar { + }.enterURLAndEnterToBrowser(storageCheckPage) { + verifyPageContent("Session storage empty") + verifyPageContent("Local storage empty") + }.openNavigationToolbar { + }.enterURLAndEnterToBrowser(storageWritePage) { verifyPageContent("No cookies set") } } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt index f0317b15f..976e6777c 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt @@ -51,10 +51,10 @@ class SettingsSubMenuDeleteBrowsingDataOnQuitRobot { openTabsCheckbox .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) - browsingDataCheckbox + browsingHistoryCheckbox .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) - cookiesCheckbox + cookiesAndSiteDataCheckbox .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) onView(withText(R.string.preferences_delete_browsing_data_cookies_subtitle)) @@ -107,10 +107,10 @@ private val deleteBrowsingOnQuitButton = private val openTabsCheckbox = onView(withText(R.string.preferences_delete_browsing_data_tabs_title_2)) -private val browsingDataCheckbox = - onView(withText(R.string.preferences_delete_browsing_data_browsing_data_title)) +private val browsingHistoryCheckbox = + onView(withText(R.string.preferences_delete_browsing_data_browsing_history_title)) -private val cookiesCheckbox = onView(withText(R.string.preferences_delete_browsing_data_cookies)) +private val cookiesAndSiteDataCheckbox = onView(withText(R.string.preferences_delete_browsing_data_cookies_and_site_data)) private val cachedFilesCheckbox = onView(withText(R.string.preferences_delete_browsing_data_cached_files)) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt index 0adfbe8d5..178575ce0 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt @@ -183,15 +183,15 @@ private fun browsingHistorySubsection() = private fun browsingHistoryDescription(addresses: String) = mDevice.findObject(UiSelector().textContains("$addresses addresses")) private fun browsingHistoryCheckBox() = - onView(allOf(withId(R.id.checkbox), hasSibling(withText("Browsing history and site data")))) + onView(allOf(withId(R.id.checkbox), hasSibling(withText("Browsing history")))) private fun cookiesSubsection() = onView(withText(R.string.preferences_delete_browsing_data_cookies)) -private fun cookiesDescription() = onView(withText(R.string.preferences_delete_browsing_data_cookies_subtitle)) +private fun cookiesAndSiteDataDescription() = onView(withText(R.string.preferences_delete_browsing_data_cookies_subtitle)) -private fun cookiesCheckBox() = - onView(allOf(withId(R.id.checkbox), hasSibling(withText("Cookies")))) +private fun cookiesAndSiteDataCheckBox() = + onView(allOf(withId(R.id.checkbox), hasSibling(withText("Cookies and site data")))) private fun cachedFilesSubsection() = onView(withText(R.string.preferences_delete_browsing_data_cached_files)) @@ -226,8 +226,8 @@ private fun assertAllOptionsAndCheckBoxes() { assertTrue(browsingHistoryDescription("0").waitForExists(waitingTime)) browsingHistoryCheckBox().check(matches(withEffectiveVisibility(Visibility.VISIBLE))) cookiesSubsection().check(matches(withEffectiveVisibility(Visibility.VISIBLE))) - cookiesDescription().check(matches(withEffectiveVisibility(Visibility.VISIBLE))) - cookiesCheckBox().check(matches(withEffectiveVisibility(Visibility.VISIBLE))) + cookiesAndSiteDataDescription().check(matches(withEffectiveVisibility(Visibility.VISIBLE))) + cookiesAndSiteDataCheckBox().check(matches(withEffectiveVisibility(Visibility.VISIBLE))) cachedFilesSubsection().check(matches(withEffectiveVisibility(Visibility.VISIBLE))) cachedFilesDescription().check(matches(withEffectiveVisibility(Visibility.VISIBLE))) cachedFilesCheckBox().check(matches(withEffectiveVisibility(Visibility.VISIBLE))) @@ -240,7 +240,7 @@ private fun assertAllOptionsAndCheckBoxes() { private fun assertAllCheckBoxesAreChecked() { openTabsCheckBox().assertIsChecked(true) browsingHistoryCheckBox().assertIsChecked(true) - cookiesCheckBox().assertIsChecked(true) + cookiesAndSiteDataCheckBox().assertIsChecked(true) cachedFilesCheckBox().assertIsChecked(true) sitePermissionsCheckBox().assertIsChecked(true) downloadsCheckBox().assertIsChecked(true) @@ -264,8 +264,8 @@ private fun clickOpenTabsCheckBox() = openTabsCheckBox().click() private fun assertOpenTabsCheckBox(status: Boolean) = openTabsCheckBox().assertIsChecked(status) private fun clickBrowsingHistoryCheckBox() = browsingHistoryCheckBox().click() private fun assertBrowsingHistoryCheckBox(status: Boolean) = browsingHistoryCheckBox().assertIsChecked(status) -private fun clickCookiesCheckBox() = cookiesCheckBox().click() -private fun assertCookiesCheckBox(status: Boolean) = cookiesCheckBox().assertIsChecked(status) +private fun clickCookiesCheckBox() = cookiesAndSiteDataCheckBox().click() +private fun assertCookiesCheckBox(status: Boolean) = cookiesAndSiteDataCheckBox().assertIsChecked(status) private fun clickCachedFilesCheckBox() = cachedFilesCheckBox().click() private fun assertCachedFilesCheckBox(status: Boolean) = cachedFilesCheckBox().assertIsChecked(status) private fun clickSitePermissionsCheckBox() = sitePermissionsCheckBox().click() 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 98c44f169..fcfd9c713 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 @@ -56,8 +56,8 @@ fun deleteAndQuit(activity: Activity, coroutineScope: CoroutineScope, snackbar: private suspend fun DeleteBrowsingDataController.deleteType(type: DeleteBrowsingDataOnQuitType) { when (type) { DeleteBrowsingDataOnQuitType.TABS -> deleteTabs() - DeleteBrowsingDataOnQuitType.HISTORY -> deleteBrowsingData() - DeleteBrowsingDataOnQuitType.COOKIES -> deleteCookies() + DeleteBrowsingDataOnQuitType.HISTORY -> deleteBrowsingHistory() + DeleteBrowsingDataOnQuitType.COOKIES -> deleteCookiesAndSiteData() DeleteBrowsingDataOnQuitType.CACHE -> deleteCachedFiles() DeleteBrowsingDataOnQuitType.PERMISSIONS -> withContext(IO) { deleteSitePermissions() 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 cd668b699..982cc5fab 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 @@ -19,8 +19,8 @@ import kotlin.coroutines.CoroutineContext interface DeleteBrowsingDataController { suspend fun deleteTabs() - suspend fun deleteBrowsingData() - suspend fun deleteCookies() + suspend fun deleteBrowsingHistory() + suspend fun deleteCookiesAndSiteData() suspend fun deleteCachedFiles() suspend fun deleteSitePermissions() suspend fun deleteDownloads() @@ -44,9 +44,8 @@ class DefaultDeleteBrowsingDataController( } } - override suspend fun deleteBrowsingData() { + override suspend fun deleteBrowsingHistory() { withContext(coroutineContext) { - engine.clearData(Engine.BrowsingData.select(Engine.BrowsingData.DOM_STORAGES)) historyStorage.deleteEverything() store.dispatch(EngineAction.PurgeHistoryAction) iconsStorage.clear() @@ -54,7 +53,7 @@ class DefaultDeleteBrowsingDataController( } } - override suspend fun deleteCookies() { + override suspend fun deleteCookiesAndSiteData() { withContext(coroutineContext) { engine.clearData( Engine.BrowsingData.select( @@ -62,6 +61,7 @@ class DefaultDeleteBrowsingDataController( Engine.BrowsingData.AUTH_SESSIONS, ), ) + engine.clearData(Engine.BrowsingData.select(Engine.BrowsingData.DOM_STORAGES)) } } 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 6a578ef0b..b2d5c8c75 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 @@ -67,8 +67,8 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da getCheckboxes().iterator().forEach { it.isChecked = when (it.id) { R.id.open_tabs_item -> settings.deleteOpenTabs - R.id.browsing_data_item -> settings.deleteBrowsingHistory - R.id.cookies_item -> settings.deleteCookies + R.id.browsing_history_item -> settings.deleteBrowsingHistory + R.id.cookies_and_site_data_item -> settings.deleteCookies R.id.cached_files_item -> settings.deleteCache R.id.site_permissions_item -> settings.deleteSitePermissions R.id.downloads_item -> settings.deleteDownloads @@ -85,8 +85,8 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da private fun updatePreference(it: DeleteBrowsingDataItem) { when (it.id) { R.id.open_tabs_item -> settings.deleteOpenTabs = it.isChecked - R.id.browsing_data_item -> settings.deleteBrowsingHistory = it.isChecked - R.id.cookies_item -> settings.deleteCookies = it.isChecked + R.id.browsing_history_item -> settings.deleteBrowsingHistory = it.isChecked + R.id.cookies_and_site_data_item -> settings.deleteCookies = it.isChecked R.id.cached_files_item -> settings.deleteCache = it.isChecked R.id.site_permissions_item -> settings.deleteSitePermissions = it.isChecked R.id.downloads_item -> settings.deleteDownloads = it.isChecked @@ -163,8 +163,8 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da if (v.isChecked) { when (i) { OPEN_TABS_INDEX -> controller.deleteTabs() - HISTORY_INDEX -> controller.deleteBrowsingData() - COOKIES_INDEX -> controller.deleteCookies() + HISTORY_INDEX -> controller.deleteBrowsingHistory() + COOKIES_INDEX -> controller.deleteCookiesAndSiteData() CACHED_INDEX -> controller.deleteCachedFiles() PERMS_INDEX -> controller.deleteSitePermissions() DOWNLOADS_INDEX -> controller.deleteDownloads() @@ -251,12 +251,12 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da } private fun updateHistoryCount() { - binding.browsingDataItem.subtitleView.text = "" + binding.browsingHistoryItem.subtitleView.text = "" viewLifecycleOwner.lifecycleScope.launch(IO) { val historyCount = requireComponents.core.historyStorage.getVisited().size launch(Main) { - binding.browsingDataItem.apply { + binding.browsingHistoryItem.apply { subtitleView.text = resources.getString( R.string.preferences_delete_browsing_data_browsing_data_subtitle, @@ -282,8 +282,8 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da private fun getCheckboxes(): List { return listOf( binding.openTabsItem, - binding.browsingDataItem, - binding.cookiesItem, + binding.browsingHistoryItem, + binding.cookiesAndSiteDataItem, binding.cachedFilesItem, binding.sitePermissionsItem, binding.downloadsItem, diff --git a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitType.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitType.kt index 01a5f5879..401e9f2d4 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitType.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataOnQuitType.kt @@ -12,7 +12,7 @@ import org.mozilla.fenix.ext.getPreferenceKey enum class DeleteBrowsingDataOnQuitType(@StringRes private val prefKey: Int) { TABS(R.string.pref_key_delete_open_tabs_on_quit), HISTORY(R.string.pref_key_delete_browsing_history_on_quit), - COOKIES(R.string.pref_key_delete_cookies_on_quit), + COOKIES(R.string.pref_key_delete_cookies_and_site_data_on_quit), CACHE(R.string.pref_key_delete_caches_on_quit), PERMISSIONS(R.string.pref_key_delete_permissions_on_quit), DOWNLOADS(R.string.pref_key_delete_downloads_on_quit), 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 4908f171f..2d6edb028 100644 --- a/app/src/main/res/layout/fragment_delete_browsing_data.xml +++ b/app/src/main/res/layout/fragment_delete_browsing_data.xml @@ -39,23 +39,23 @@ app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_tabs_title_2" app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_tabs_subtitle" /> pref_key_delete_browsing_data_on_quit pref_key_delete_open_tabs_on_quit pref_key_delete_browsing_history_on_quit - pref_key_delete_cookies_on_quit + pref_key_delete_cookies_and_site_data_on_quit pref_key_delete_caches_on_quit pref_key_delete_permissions_on_quit pref_key_delete_downloads_on_quit diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 58f937c0a..599c86b94 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1307,12 +1307,16 @@ %d tabs - Browsing history and site data + Browsing history and site data + + Browsing history %d addresses - Cookies + Cookies + + Cookies and site data You’ll be logged out of most sites diff --git a/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml b/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml index e125809d3..a5cc8cabb 100644 --- a/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml +++ b/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml @@ -22,12 +22,12 @@ + android:title="@string/preferences_delete_browsing_data_browsing_history_title" /> + android:title="@string/preferences_delete_browsing_data_cookies_and_site_data" /> UndocumentedPublicFunction:DefaultToolbarMenu.kt$DefaultToolbarMenu$@VisibleForTesting(otherwise = PRIVATE) fun canInstall(): Boolean UndocumentedPublicFunction:DefaultToolbarMenu.kt$DefaultToolbarMenu$@VisibleForTesting(otherwise = PRIVATE) fun shouldShowOpenInApp(): Boolean UndocumentedPublicFunction:DefaultToolbarMenu.kt$DefaultToolbarMenu$@VisibleForTesting(otherwise = PRIVATE) fun shouldShowReaderViewCustomization(): Boolean - UndocumentedPublicFunction:DeleteBrowsingDataController.kt$DeleteBrowsingDataController$suspend fun deleteBrowsingData() + UndocumentedPublicFunction:DeleteBrowsingDataController.kt$DeleteBrowsingDataController$suspend fun deleteBrowsingHistory() UndocumentedPublicFunction:DeleteBrowsingDataController.kt$DeleteBrowsingDataController$suspend fun deleteCachedFiles() - UndocumentedPublicFunction:DeleteBrowsingDataController.kt$DeleteBrowsingDataController$suspend fun deleteCookies() + UndocumentedPublicFunction:DeleteBrowsingDataController.kt$DeleteBrowsingDataController$suspend fun deleteCookiesAndSiteData() UndocumentedPublicFunction:DeleteBrowsingDataController.kt$DeleteBrowsingDataController$suspend fun deleteDownloads() UndocumentedPublicFunction:DeleteBrowsingDataController.kt$DeleteBrowsingDataController$suspend fun deleteSitePermissions() UndocumentedPublicFunction:DeleteBrowsingDataController.kt$DeleteBrowsingDataController$suspend fun deleteTabs()