Files
IronFox/patches/sanitize-on-exit.patch

84 lines
4.3 KiB
Diff

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 45049272b7..0ad31c9b0b 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -946,7 +946,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
var shouldDeleteBrowsingDataOnQuit by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_delete_browsing_data_on_quit),
- default = false,
+ default = true,
)
var deleteOpenTabs by booleanPreference(
@@ -961,7 +961,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
var deleteCookies by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_delete_cookies_now),
- default = true,
+ default = false,
)
var deleteCache by booleanPreference(
@@ -971,7 +971,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
var deleteSitePermissions by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_delete_permissions_now),
- default = true,
+ default = false,
)
var deleteDownloads by booleanPreference(
@@ -1027,7 +1027,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
}
fun getDeleteDataOnQuit(type: DeleteBrowsingDataOnQuitType): Boolean =
- preferences.getBoolean(type.getPreferenceKey(appContext), false)
+ preferences.getBoolean(type.getPreferenceKey(appContext), true)
fun setDeleteDataOnQuit(type: DeleteBrowsingDataOnQuitType, value: Boolean) {
preferences.edit().putBoolean(type.getPreferenceKey(appContext), value).apply()
diff --git a/mobile/android/fenix/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml b/mobile/android/fenix/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml
index a5cc8cabb6..f38c9f61c4 100644
--- a/mobile/android/fenix/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml
+++ b/mobile/android/fenix/app/src/main/res/xml/delete_browsing_data_quit_preferences.xml
@@ -5,7 +5,7 @@
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<SwitchPreference
- android:defaultValue="false"
+ android:defaultValue="true"
android:key="@string/pref_key_delete_browsing_data_on_quit"
android:summary="@string/preference_summary_delete_browsing_data_on_quit_2"
android:title="@string/preferences_delete_browsing_data_on_quit" />
@@ -16,10 +16,12 @@
app:iconSpaceReserved="false"
android:layout="@layout/preference_category_empty">
<CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_key_delete_open_tabs_on_quit"
android:layout="@layout/checkbox_left_preference"
android:title="@string/preferences_delete_browsing_data_tabs_title_2" />
<CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_key_delete_browsing_history_on_quit"
android:layout="@layout/checkbox_left_preference"
android:title="@string/preferences_delete_browsing_data_browsing_history_title" />
@@ -29,6 +31,7 @@
android:summary="@string/preferences_delete_browsing_data_cookies_subtitle"
android:title="@string/preferences_delete_browsing_data_cookies_and_site_data" />
<CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_key_delete_caches_on_quit"
android:layout="@layout/checkbox_left_preference"
android:summary="@string/preferences_delete_browsing_data_cached_files_subtitle"
@@ -39,6 +42,7 @@
android:title="@string/preferences_delete_browsing_data_site_permissions" />
<CheckBoxPreference
+ android:defaultValue="true"
android:key="@string/pref_key_delete_downloads_on_quit"
android:layout="@layout/checkbox_left_preference"
android:title="@string/preferences_delete_browsing_data_downloads" />