X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FSettingsFragment.kt;fp=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FSettingsFragment.kt;h=b5d14b44c054863896066a1ecd7a9167946a9faf;hp=10a4532d0880867c0283e48096a5839f9680de7a;hb=e065315a36c804626a7dba38d3edad05e9fdb473;hpb=7a54e6907e74196a4840a2434dd13e2b68a95db4 diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt index 10a4532d..b5d14b44 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt @@ -33,7 +33,6 @@ import android.widget.ArrayAdapter import androidx.appcompat.app.AppCompatDelegate import androidx.preference.Preference -import androidx.preference.PreferenceCategory import androidx.preference.PreferenceFragmentCompat import com.stoutner.privacybrowser.R @@ -65,7 +64,6 @@ class SettingsFragment : PreferenceFragmentCompat() { private lateinit var clearCookiesPreference: Preference private lateinit var clearDomStoragePreference: Preference private lateinit var clearEverythingPreference: Preference - private lateinit var clearFormDataPreference: Preference // The clear form data preference can be removed once the minimum API >= 26. private lateinit var clearLogcatPreference: Preference private lateinit var cookiesPreference: Preference private lateinit var customUserAgentPreference: Preference @@ -80,7 +78,6 @@ class SettingsFragment : PreferenceFragmentCompat() { private lateinit var fanboyAnnoyanceListPreference: Preference private lateinit var fanboySocialBlockingListPreference: Preference private lateinit var fontSizePreference: Preference - private lateinit var formDataPreference: Preference // The form data preference can be removed once the minimum API >= 26. private lateinit var fullScreenBrowsingModePreference: Preference private lateinit var hideAppBarPreference: Preference private lateinit var displayUnderCutoutsPreference: Preference @@ -127,7 +124,6 @@ class SettingsFragment : PreferenceFragmentCompat() { javaScriptPreference = findPreference(getString(R.string.javascript_key))!! cookiesPreference = findPreference(getString(R.string.cookies_key))!! domStoragePreference = findPreference(getString(R.string.dom_storage_key))!! - formDataPreference = findPreference(getString(R.string.save_form_data_key))!! // The form data preference can be removed once the minimum API >= 26. userAgentPreference = findPreference(getString(R.string.user_agent_key))!! customUserAgentPreference = findPreference(getString(R.string.custom_user_agent_key))!! incognitoModePreference = findPreference(getString(R.string.incognito_mode_key))!! @@ -151,7 +147,6 @@ class SettingsFragment : PreferenceFragmentCompat() { clearEverythingPreference = findPreference(getString(R.string.clear_everything_key))!! clearCookiesPreference = findPreference(getString(R.string.clear_cookies_key))!! clearDomStoragePreference = findPreference(getString(R.string.clear_dom_storage_key))!! - clearFormDataPreference = findPreference(getString(R.string.clear_form_data_key))!! // The clear form data preference can be removed once the minimum API >= 26. clearLogcatPreference = findPreference(getString(R.string.clear_logcat_key))!! clearCachePreference = findPreference(getString(R.string.clear_cache_key))!! homepagePreference = findPreference(getString(R.string.homepage_key))!! @@ -184,17 +179,6 @@ class SettingsFragment : PreferenceFragmentCompat() { val fullScreenBrowsingMode = sharedPreferences.getBoolean(getString(R.string.full_screen_browsing_mode_key), false) val clearEverything = sharedPreferences.getBoolean(getString(R.string.clear_everything_key), true) - // Remove the form data preferences if the API is >= 26 as they no longer do anything. - if (Build.VERSION.SDK_INT >= 26) { - // Get handles for the categories. - val privacyCategory = findPreference(getString(R.string.privacy_category_key))!! - val clearAndExitCategory = findPreference(getString(R.string.clear_and_exit_category_key))!! - - // Remove the form data preferences. - privacyCategory.removePreference(formDataPreference) - clearAndExitCategory.removePreference(clearFormDataPreference) - } - // Only enable Fanboy's social blocking list preference if Fanboy's annoyance list is disabled. fanboySocialBlockingListPreference.isEnabled = !fanboyAnnoyanceListEnabled @@ -271,7 +255,6 @@ class SettingsFragment : PreferenceFragmentCompat() { // Set the status of the clear and exit preferences. clearCookiesPreference.isEnabled = !clearEverything clearDomStoragePreference.isEnabled = !clearEverything - clearFormDataPreference.isEnabled = !clearEverything // Clear form data can be removed once the minimum API is >= 26. clearLogcatPreference.isEnabled = !clearEverything clearCachePreference.isEnabled = !clearEverything @@ -344,14 +327,6 @@ class SettingsFragment : PreferenceFragmentCompat() { domStoragePreference.setIcon(R.drawable.dom_storage_ghosted) } - // Set the save form data icon if API < 26. Save form data has no effect on API >= 26. - if (Build.VERSION.SDK_INT < 26) { - if (sharedPreferences.getBoolean(getString(R.string.save_form_data_key), false)) - formDataPreference.setIcon(R.drawable.form_data_enabled) - else - formDataPreference.setIcon(R.drawable.form_data_disabled) - } - // Set the custom user agent icon. if (customUserAgentPreference.isEnabled) customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled) @@ -495,14 +470,6 @@ class SettingsFragment : PreferenceFragmentCompat() { else clearDomStoragePreference.setIcon(R.drawable.clear_dom_storage_disabled) - // Set the clear form data icon if the API < 26. It has no effect on newer versions of Android. - if (Build.VERSION.SDK_INT < 26) { - if (clearEverything || sharedPreferences.getBoolean(getString(R.string.clear_form_data_key), true)) - clearFormDataPreference.setIcon(R.drawable.clear_form_data_enabled) - else - clearFormDataPreference.setIcon(R.drawable.clear_form_data_disabled) - } - // Set the clear logcat icon. if (clearEverything || sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) clearLogcatPreference.setIcon(R.drawable.clear_logcat_enabled) @@ -679,14 +646,6 @@ class SettingsFragment : PreferenceFragmentCompat() { domStoragePreference.setIcon(R.drawable.dom_storage_disabled) } - getString(R.string.save_form_data_key) -> { // Saved form data can be removed once the minimum API >= 26. - // Update the icon. - if (sharedPreferences.getBoolean(getString(R.string.save_form_data_key), false)) - formDataPreference.setIcon(R.drawable.form_data_enabled) - else - formDataPreference.setIcon(R.drawable.form_data_disabled) - } - getString(R.string.user_agent_key) -> { // Get the new user agent name. val newUserAgentName = sharedPreferences.getString(getString(R.string.user_agent_key), getString(R.string.user_agent_default_value)) @@ -965,7 +924,6 @@ class SettingsFragment : PreferenceFragmentCompat() { // Update the status of the clear and exit preferences. clearCookiesPreference.isEnabled = !newClearEverythingBoolean clearDomStoragePreference.isEnabled = !newClearEverythingBoolean - clearFormDataPreference.isEnabled = !newClearEverythingBoolean // Clear form data can be removed once the minimum API >= 26. clearLogcatPreference.isEnabled = !newClearEverythingBoolean clearCachePreference.isEnabled = !newClearEverythingBoolean @@ -987,14 +945,6 @@ class SettingsFragment : PreferenceFragmentCompat() { else clearDomStoragePreference.setIcon(R.drawable.clear_dom_storage_disabled) - // Update the clear form data preference icon if the API < 26. - if (Build.VERSION.SDK_INT < 26) { - if (newClearEverythingBoolean || sharedPreferences.getBoolean(getString(R.string.clear_form_data_key), true)) - clearFormDataPreference.setIcon(R.drawable.clear_form_data_enabled) - else - clearFormDataPreference.setIcon(R.drawable.clear_form_data_disabled) - } - // Update the clear logcat preference icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) clearLogcatPreference.setIcon(R.drawable.clear_logcat_enabled) @@ -1024,14 +974,6 @@ class SettingsFragment : PreferenceFragmentCompat() { clearDomStoragePreference.setIcon(R.drawable.clear_dom_storage_disabled) } - getString(R.string.clear_form_data_key) -> { - // Update the icon. - if (sharedPreferences.getBoolean(getString(R.string.clear_form_data_key), true)) - clearFormDataPreference.setIcon(R.drawable.clear_form_data_enabled) - else - clearFormDataPreference.setIcon(R.drawable.clear_form_data_disabled) - } - getString(R.string.clear_logcat_key) -> { // Update the icon. if (sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true))