mirror of
https://github.com/ironfox-oss/IronFox.git
synced 2026-01-26 23:09:16 -05:00
83 lines
4.5 KiB
Diff
83 lines
4.5 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 8913d9f230..a2a9e14237 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
|
|
@@ -1018,7 +1018,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(
|
|
@@ -1104,8 +1104,17 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
return touchExplorationIsEnabled || switchServiceIsEnabled
|
|
}
|
|
|
|
- fun getDeleteDataOnQuit(type: DeleteBrowsingDataOnQuitType): Boolean =
|
|
- preferences.getBoolean(type.getPreferenceKey(appContext), false)
|
|
+ fun getDeleteDataOnQuit(type: DeleteBrowsingDataOnQuitType): Boolean {
|
|
+ val defaultValue = when(type) {
|
|
+ DeleteBrowsingDataOnQuitType.CACHE -> true
|
|
+ DeleteBrowsingDataOnQuitType.DOWNLOADS -> true
|
|
+ DeleteBrowsingDataOnQuitType.HISTORY -> true
|
|
+ DeleteBrowsingDataOnQuitType.TABS -> true
|
|
+ else -> false
|
|
+ }
|
|
+
|
|
+ return preferences.getBoolean(type.getPreferenceKey(appContext), defaultValue)
|
|
+ }
|
|
|
|
fun setDeleteDataOnQuit(type: DeleteBrowsingDataOnQuitType, value: Boolean) {
|
|
preferences.edit { putBoolean(type.getPreferenceKey(appContext), value) }
|
|
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..ea74ef7ee4 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,29 +16,35 @@
|
|
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" />
|
|
<CheckBoxPreference
|
|
+ android:defaultValue="false"
|
|
android:key="@string/pref_key_delete_cookies_and_site_data_on_quit"
|
|
android:layout="@layout/checkbox_left_preference"
|
|
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"
|
|
android:title="@string/preferences_delete_browsing_data_cached_files" />
|
|
<CheckBoxPreference
|
|
+ android:defaultValue="false"
|
|
android:key="@string/pref_key_delete_permissions_on_quit"
|
|
android:layout="@layout/checkbox_left_preference"
|
|
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" />
|