Hendrik Knackstedt
<h3>Mitwirkende</h3>
- Stefan Erhardt: German<br/>
Francesco Buratti: Italienisch<br/>
Jose A. León: Spanisch
<h3>Past Translators</h3>
- <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: German<br/>
+ Stefan Erhardt: German<br/>
+ <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: German
+
+ <br/>
<br/>
<p>Mitwirkung ist willkommen in Form von <a href="https://www.stoutner.com/privacy-browser/contributors/">Code und Übersetzung</a>.</p>
</body>
Hendrik Knackstedt
<h3>Mitwirkende</h3>
- Stefan Erhardt: German<br/>
Francesco Buratti: Italienisch<br/>
Jose A. León: Spanisch
<h3>Past Translators</h3>
- <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: German<br/>
+ Stefan Erhardt: German<br/>
+ <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: German
+
+ <br/>
<br/>
<p>Mitwirkung ist willkommen in Form von <a href="https://www.stoutner.com/privacy-browser/contributors/">Code und Übersetzung</a>.</p>
</body>
Hendrik Knackstedt
<h3>Translators</h3>
- Stefan Erhardt: German<br/>
Francesco Buratti: Italian<br/>
Jose A. León: Spanish
<h3>Past Translators</h3>
- <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: German<br/>
+ Stefan Erhardt: German<br/>
+ <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: German
+ <br/>
<br/>
<p>Contributors are welcome to submit both <a href="https://www.stoutner.com/privacy-browser/contributors/">code and translations</a>.</p>
</body>
Hendrik Knackstedt
<h3>Translators</h3>
- Stefan Erhardt: German<br/>
Francesco Buratti: Italian<br/>
Jose A. León: Spanish
<h3>Past Translators</h3>
- <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: German<br/>
+ Stefan Erhardt: German<br/>
+ <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: German
+ <br/>
<br/>
<p>Contributors are welcome to submit both <a href="https://www.stoutner.com/privacy-browser/contributors/">code and translations</a>.</p>
</body>
Hendrik Knackstedt
<h3>Traductores</h3>
- Stefan Erhardt: Alemán<br/>
Francesco Buratti: Italiano<br/>
Jose A. León: Español
<h3>Traductores anteriores</h3>
- <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: Alemán<br/>
+ Stefan Erhardt: Alemán<br/>
+ <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: Alemán
+ <br/>
<br/>
<p>Los colaboradores son bienvenidos para enviar tanto <a href="https://www.stoutner.com/privacy-browser/contributors/">código como traducciones</a>.</p>
</body>
Hendrik Knackstedt
<h3>Traductores</h3>
- Stefan Erhardt: Alemán<br/>
Francesco Buratti: Italiano<br/>
Jose A. León: Español
<h3>Traductores anteriores</h3>
- <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: Alemán<br/>
+ Stefan Erhardt: Alemán<br/>
+ <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: Alemán
+ <br/>
<br/>
<p>Los colaboradores son bienvenidos para enviar tanto <a href="https://www.stoutner.com/privacy-browser/contributors/">código como traducciones</a>.</p>
</body>
Hendrik Knackstedt
<h3>Traduttori</h3>
- Stefan Erhardt: Tedesco<br/>
Francesco Buratti: Italiano<br/>
Jose A. León: Spagnolo
<h3>Traduttori precedenti</h3>
- <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: Tedesco<br/>
+ Stefan Erhardt: Tedesco<br/>
+ <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: Tedesco
+ <br/>
<br/>
<p>Si accettano contributi per lo sviluppo di <a href="https://www.stoutner.com/privacy-browser/contributors/">codice e traduzioni</a>.</p>
</body>
Hendrik Knackstedt
<h3>Traduttori</h3>
- Stefan Erhardt: Tedesco<br/>
Francesco Buratti: Italiano<br/>
Jose A. León: Spagnolo
<h3>Traduttori precedenti</h3>
- <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: Tedesco<br/>
+ Stefan Erhardt: Tedesco<br/>
+ <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: Tedesco
+ <br/>
<br/>
<p>Si accettano contributi per lo sviluppo di <a href="https://www.stoutner.com/privacy-browser/contributors/">codice e traduzioni</a>.</p>
</body>
Hendrik Knackstedt
<h3>Переводчики</h3>
- Stefan Erhardt: немецкий<br/>
Francesco Buratti: итальянский<br/>
Jose A. León: испанский
<h3>Предыдущие переводчики</h3>
- <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: немецкий<br/>
+ Stefan Erhardt: немецкий<br/>
+ <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: немецкий
+ <br/>
<br/>
<p>Приглашаем помочь как <a href="https://www.stoutner.com/privacy-browser/contributors/">кодом, так и переводом</a>.</p>
</body>
Hendrik Knackstedt
<h3>Переводчики</h3>
- Stefan Erhardt: немецкий<br/>
Francesco Buratti: итальянский<br/>
Jose A. León: испанский
<h3>Предыдущие переводчики</h3>
- <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: немецкий<br/>
+ Stefan Erhardt: немецкий<br/>
+ <a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: немецкий
+ <br/>
<br/>
<p>Приглашаем помочь как <a href="https://www.stoutner.com/privacy-browser/contributors/">кодом, так и переводом</a>.</p>
</body>
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
// Get the JavaScript preference.
- javaScriptEnabled = sharedPreferences.getBoolean("javascript_enabled", false);
+ javaScriptEnabled = sharedPreferences.getBoolean("javascript", false);
}
// Apply the JavaScript setting to the WebView.
}
} else { // The new URL does not have custom domain settings. Load the defaults.
// Store the values from `sharedPreferences` in variables.
- javaScriptEnabled = sharedPreferences.getBoolean("javascript_enabled", false);
- firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies_enabled", false);
- thirdPartyCookiesEnabled = sharedPreferences.getBoolean("third_party_cookies_enabled", false);
- domStorageEnabled = sharedPreferences.getBoolean("dom_storage_enabled", false);
- saveFormDataEnabled = sharedPreferences.getBoolean("save_form_data_enabled", false); // Form data can be removed once the minimum API >= 26.
+ javaScriptEnabled = sharedPreferences.getBoolean("javascript", false);
+ firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies", false);
+ thirdPartyCookiesEnabled = sharedPreferences.getBoolean("third_party_cookies", false);
+ domStorageEnabled = sharedPreferences.getBoolean("dom_storage", false);
+ saveFormDataEnabled = sharedPreferences.getBoolean("save_form_data", false); // Form data can be removed once the minimum API >= 26.
easyListEnabled = sharedPreferences.getBoolean("easylist", true);
easyPrivacyEnabled = sharedPreferences.getBoolean("easyprivacy", true);
- fanboysAnnoyanceListEnabled = sharedPreferences.getBoolean("fanboy_annoyance_list", true);
- fanboysSocialBlockingListEnabled = sharedPreferences.getBoolean("fanboy_social_blocking_list", true);
+ fanboysAnnoyanceListEnabled = sharedPreferences.getBoolean("fanboys_annoyance_list", true);
+ fanboysSocialBlockingListEnabled = sharedPreferences.getBoolean("fanboys_social_blocking_list", true);
ultraPrivacyEnabled = sharedPreferences.getBoolean("ultraprivacy", true);
blockAllThirdPartyRequests = sharedPreferences.getBoolean("block_all_third_party_requests", false);
savedPreferences = getPreferenceScreen().getSharedPreferences();
// Get handles for the preferences.
- final Preference javaScriptPreference = findPreference("javascript_enabled");
- final Preference firstPartyCookiesPreference = findPreference("first_party_cookies_enabled");
- final Preference thirdPartyCookiesPreference = findPreference("third_party_cookies_enabled");
- final Preference domStoragePreference = findPreference("dom_storage_enabled");
- final Preference saveFormDataPreference = findPreference("save_form_data_enabled"); // The form data preference can be removed once the minimum API >= 26.
+ final Preference javaScriptPreference = findPreference("javascript");
+ final Preference firstPartyCookiesPreference = findPreference("first_party_cookies");
+ final Preference thirdPartyCookiesPreference = findPreference("third_party_cookies");
+ final Preference domStoragePreference = findPreference("dom_storage");
+ final Preference saveFormDataPreference = findPreference("save_form_data"); // The form data preference can be removed once the minimum API >= 26.
final Preference userAgentPreference = findPreference("user_agent");
final Preference customUserAgentPreference = findPreference("custom_user_agent");
final Preference incognitoModePreference = findPreference("incognito_mode");
final Preference allowScreenshotsPreference = findPreference("allow_screenshots");
final Preference easyListPreference = findPreference("easylist");
final Preference easyPrivacyPreference = findPreference("easyprivacy");
- final Preference fanboyAnnoyanceListPreference = findPreference("fanboy_annoyance_list");
- final Preference fanboySocialBlockingListPreference = findPreference("fanboy_social_blocking_list");
+ final Preference fanboyAnnoyanceListPreference = findPreference("fanboys_annoyance_list");
+ final Preference fanboySocialBlockingListPreference = findPreference("fanboys_social_blocking_list");
final Preference ultraPrivacyPreference = findPreference("ultraprivacy");
final Preference blockAllThirdPartyRequestsPreference = findPreference("block_all_third_party_requests");
final Preference proxyThroughOrbotPreference = findPreference("proxy_through_orbot");
String searchString = savedPreferences.getString("search", getString(R.string.search_default_value));
// Get booleans that are used in multiple places from the preferences.
- final boolean javaScriptEnabled = savedPreferences.getBoolean("javascript_enabled", false);
- boolean firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies_enabled", false);
- boolean thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies_enabled", false);
- boolean fanboyAnnoyanceListEnabled = savedPreferences.getBoolean("fanboy_annoyance_list", true);
- boolean fanboySocialBlockingEnabled = savedPreferences.getBoolean("fanboy_social_blocking_list", true);
+ final boolean javaScriptEnabled = savedPreferences.getBoolean("javascript", false);
+ boolean firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies", false);
+ boolean thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies", false);
+ boolean fanboyAnnoyanceListEnabled = savedPreferences.getBoolean("fanboys_annoyance_list", true);
+ boolean fanboySocialBlockingEnabled = savedPreferences.getBoolean("fanboys_social_blocking_list", true);
boolean proxyThroughOrbot = savedPreferences.getBoolean("proxy_through_orbot", false);
boolean fullScreenBrowsingMode = savedPreferences.getBoolean("full_screen_browsing_mode", false);
boolean hideSystemBars = savedPreferences.getBoolean("hide_system_bars", false);
// Set the DOM storage icon.
if (javaScriptEnabled || nightMode) { // The preference is enabled.
- if (savedPreferences.getBoolean("dom_storage_enabled", false)) { // DOM storage is enabled.
+ if (savedPreferences.getBoolean("dom_storage", false)) { // DOM storage is enabled.
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else { // DOM storage is disabled.
if (MainWebViewActivity.darkTheme) {
// 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 (savedPreferences.getBoolean("save_form_data_enabled", false)) {
+ if (savedPreferences.getBoolean("save_form_data", false)) {
saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
} else {
if (MainWebViewActivity.darkTheme) {
// Listen for preference changes.
preferencesListener = (SharedPreferences sharedPreferences, String key) -> {
switch (key) {
- case "javascript_enabled":
+ case "javascript":
// Update the icons and the DOM storage preference status.
- if (sharedPreferences.getBoolean("javascript_enabled", false)) { // The JavaScript preference is enabled.
+ if (sharedPreferences.getBoolean("javascript", false)) { // The JavaScript preference is enabled.
// Update the icon for the JavaScript preference.
javaScriptPreference.setIcon(R.drawable.javascript_enabled);
domStoragePreference.setEnabled(true);
// Update the icon for the DOM storage preference.
- if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
+ if (sharedPreferences.getBoolean("dom_storage", false)) {
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else {
if (MainWebViewActivity.darkTheme) {
}
break;
- case "first_party_cookies_enabled":
- // Update the icons for `first_party_cookies_enabled` and `third_party_cookies_enabled`.
- if (sharedPreferences.getBoolean("first_party_cookies_enabled", false)) {
- // Set the icon for `first_party_cookies_enabled`.
+ case "first_party_cookies":
+ // Update the icons for `first_party_cookies` and `third_party_cookies`.
+ if (sharedPreferences.getBoolean("first_party_cookies", false)) {
+ // Set the icon for `first_party_cookies`.
firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled);
- // Update the icon for `third_party_cookies_enabled`.
+ // Update the icon for `third_party_cookies`.
if (Build.VERSION.SDK_INT >= 21) {
- if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
+ if (sharedPreferences.getBoolean("third_party_cookies", false)) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
} else {
if (MainWebViewActivity.darkTheme) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light);
}
}
- } else { // `first_party_cookies_enabled` is `false`.
- // Update the icon for `first_party_cookies_enabled`.
+ } else { // `first_party_cookies` is `false`.
+ // Update the icon for `first_party_cookies`.
if (MainWebViewActivity.darkTheme) {
firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark);
} else {
firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light);
}
- // Set the icon for `third_party_cookies_enabled` to be ghosted.
+ // Set the icon for `third_party_cookies` to be ghosted.
if (MainWebViewActivity.darkTheme) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark);
} else {
}
}
- // Enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21.
- thirdPartyCookiesPreference.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false) && (Build.VERSION.SDK_INT >= 21));
+ // Enable `third_party_cookies` if `first_party_cookies` is `true` and API >= 21.
+ thirdPartyCookiesPreference.setEnabled(sharedPreferences.getBoolean("first_party_cookies", false) && (Build.VERSION.SDK_INT >= 21));
break;
- case "third_party_cookies_enabled":
+ case "third_party_cookies":
// Update the icon.
- if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
+ if (sharedPreferences.getBoolean("third_party_cookies", false)) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
} else {
if (MainWebViewActivity.darkTheme) {
}
break;
- case "dom_storage_enabled":
+ case "dom_storage":
// Update the icon.
- if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
+ if (sharedPreferences.getBoolean("dom_storage", false)) {
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else {
if (MainWebViewActivity.darkTheme) {
break;
// Save form data can be removed once the minimum API >= 26.
- case "save_form_data_enabled":
+ case "save_form_data":
// Update the icon.
- if (sharedPreferences.getBoolean("save_form_data_enabled", false)) {
+ if (sharedPreferences.getBoolean("save_form_data", false)) {
saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
} else {
if (MainWebViewActivity.darkTheme) {
}
break;
- case "fanboy_annoyance_list":
- boolean currentFanboyAnnoyanceList = sharedPreferences.getBoolean("fanboy_annoyance_list", true);
- boolean currentFanboySocialBlockingList = sharedPreferences.getBoolean("fanboy_social_blocking_list", true);
+ case "fanboys_annoyance_list":
+ boolean currentFanboyAnnoyanceList = sharedPreferences.getBoolean("fanboys_annoyance_list", true);
+ boolean currentFanboySocialBlockingList = sharedPreferences.getBoolean("fanboys_social_blocking_list", true);
// Update the Fanboy icons.
if (currentFanboyAnnoyanceList) { // Fanboy's annoyance list is enabled.
fanboySocialBlockingListPreference.setEnabled(!currentFanboyAnnoyanceList);
break;
- case "fanboy_social_blocking_list":
+ case "fanboys_social_blocking_list":
// Update the icon.
- if (sharedPreferences.getBoolean("fanboy_social_blocking_list", true)) {
+ if (sharedPreferences.getBoolean("fanboys_social_blocking_list", true)) {
if (MainWebViewActivity.darkTheme) {
fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_dark);
} else {
// Store the current night mode status.
boolean currentNightModeBoolean = sharedPreferences.getBoolean("night_mode", false);
- boolean currentJavaScriptBoolean = sharedPreferences.getBoolean("javascript_enabled", false);
+ boolean currentJavaScriptBoolean = sharedPreferences.getBoolean("javascript", false);
// Update the icon.
if (currentNightModeBoolean) {
javaScriptPreference.setIcon(R.drawable.privacy_mode);
}
- // Update the `domStoragePreference` icon.
+ // Update the DOM storage preference icon.
if (currentNightModeBoolean || currentJavaScriptBoolean) { // The preference is enabled.
- if (sharedPreferences.getBoolean("dom_storage_enabled", false)) { // DOM storage is enabled.
+ if (sharedPreferences.getBoolean("dom_storage", false)) { // DOM storage is enabled.
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else { // DOM storage is disabled.
if (MainWebViewActivity.darkTheme) {
// Get the default block list settings.
boolean easyListEnabled = sharedPreferences.getBoolean("easylist", true);
boolean easyPrivacyEnabled = sharedPreferences.getBoolean("easyprivacy", true);
- boolean fanboyAnnoyanceListEnabled = sharedPreferences.getBoolean("fanboy_annoyance_list", true);
- boolean fanboySocialBlockingListEnabled = sharedPreferences.getBoolean("fanboy_social_blocking_list", true);
+ boolean fanboyAnnoyanceListEnabled = sharedPreferences.getBoolean("fanboys_annoyance_list", true);
+ boolean fanboySocialBlockingListEnabled = sharedPreferences.getBoolean("fanboys_social_blocking_list", true);
// Set EasyList for existing rows according to the current system-wide default.
if (easyListEnabled) {
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(appContext);
// Get the default settings.
- boolean javaScriptEnabled = sharedPreferences.getBoolean("javascript_enabled", false);
- boolean firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies_enabled", false);
- boolean thirdPartyCookiesEnabled = sharedPreferences.getBoolean("third_party_cookies_enabled", false);
- boolean domStorageEnabled = sharedPreferences.getBoolean("dom_storage_enabled", false);
- boolean saveFormDataEnabled = sharedPreferences.getBoolean("save_form_data_enabled", false); // Form data can be removed once the minimum API >= 26.
+ boolean javaScriptEnabled = sharedPreferences.getBoolean("javascript", false);
+ boolean firstPartyCookiesEnabled = sharedPreferences.getBoolean("first_party_cookies", false);
+ boolean thirdPartyCookiesEnabled = sharedPreferences.getBoolean("third_party_cookies", false);
+ boolean domStorageEnabled = sharedPreferences.getBoolean("dom_storage", false);
+ boolean saveFormDataEnabled = sharedPreferences.getBoolean("save_form_data", false); // Form data can be removed once the minimum API >= 26.
boolean easyListEnabled = sharedPreferences.getBoolean("easylist", true);
boolean easyPrivacyEnabled = sharedPreferences.getBoolean("easyprivacy", true);
- boolean fanboyAnnoyanceListEnabled = sharedPreferences.getBoolean("fanboy_annoyance_list", true);
- boolean fanboySocialBlockingListEnabled = sharedPreferences.getBoolean("fanboy_social_blocking_list", true);
+ boolean fanboyAnnoyanceListEnabled = sharedPreferences.getBoolean("fanboys_annoyance_list", true);
+ boolean fanboySocialBlockingListEnabled = sharedPreferences.getBoolean("fanboys_social_blocking_list", true);
boolean ultraPrivacyEnabled = sharedPreferences.getBoolean("ultraprivacy", true);
boolean blockAllThirdPartyRequests = sharedPreferences.getBoolean("block_all_third_party_requests", false);
// Create a ContentValues with the preferences information.
ContentValues preferencesContentValues = new ContentValues();
- preferencesContentValues.put(JAVASCRIPT, sharedPreferences.getBoolean("javascript_enabled", false));
- preferencesContentValues.put(FIRST_PARTY_COOKIES, sharedPreferences.getBoolean("first_party_cookies_enabled", false));
- preferencesContentValues.put(THIRD_PARTY_COOKIES, sharedPreferences.getBoolean("third_party_cookies_enabled", false));
- preferencesContentValues.put(DOM_STORAGE, sharedPreferences.getBoolean("dom_storage_enabled", false));
- preferencesContentValues.put(SAVE_FORM_DATA, sharedPreferences.getBoolean("save_form_data_enabled", false)); // Save form data can be removed once the minimum API >= 26.
+ preferencesContentValues.put(JAVASCRIPT, sharedPreferences.getBoolean(JAVASCRIPT, false));
+ preferencesContentValues.put(FIRST_PARTY_COOKIES, sharedPreferences.getBoolean(FIRST_PARTY_COOKIES, false));
+ preferencesContentValues.put(THIRD_PARTY_COOKIES, sharedPreferences.getBoolean(THIRD_PARTY_COOKIES, false));
+ preferencesContentValues.put(DOM_STORAGE, sharedPreferences.getBoolean(DOM_STORAGE, false));
+ preferencesContentValues.put(SAVE_FORM_DATA, sharedPreferences.getBoolean(SAVE_FORM_DATA, false)); // Save form data can be removed once the minimum API >= 26.
preferencesContentValues.put(USER_AGENT, sharedPreferences.getString(USER_AGENT, context.getString(R.string.user_agent_default_value)));
preferencesContentValues.put(CUSTOM_USER_AGENT, sharedPreferences.getString(CUSTOM_USER_AGENT, context.getString(R.string.custom_user_agent_default_value)));
preferencesContentValues.put(INCOGNITO_MODE, sharedPreferences.getBoolean(INCOGNITO_MODE, false));
preferencesContentValues.put(ALLOW_SCREENSHOTS, sharedPreferences.getBoolean(ALLOW_SCREENSHOTS, false));
preferencesContentValues.put(EASYLIST, sharedPreferences.getBoolean(EASYLIST, true));
preferencesContentValues.put(EASYPRIVACY, sharedPreferences.getBoolean(EASYPRIVACY, true));
- preferencesContentValues.put(FANBOYS_ANNOYANCE_LIST, sharedPreferences.getBoolean("fanboy_annoyance_list", true));
- preferencesContentValues.put(FANBOYS_SOCIAL_BLOCKING_LIST, sharedPreferences.getBoolean("fanboy_social_blocking_list", true));
+ preferencesContentValues.put(FANBOYS_ANNOYANCE_LIST, sharedPreferences.getBoolean(FANBOYS_ANNOYANCE_LIST, true));
+ preferencesContentValues.put(FANBOYS_SOCIAL_BLOCKING_LIST, sharedPreferences.getBoolean(FANBOYS_SOCIAL_BLOCKING_LIST, true));
preferencesContentValues.put(ULTRAPRIVACY, sharedPreferences.getBoolean(ULTRAPRIVACY, true));
preferencesContentValues.put(BLOCK_ALL_THIRD_PARTY_REQUESTS, sharedPreferences.getBoolean(BLOCK_ALL_THIRD_PARTY_REQUESTS, false));
preferencesContentValues.put(PROXY_THROUGH_ORBOT, sharedPreferences.getBoolean(PROXY_THROUGH_ORBOT, false));
// Upgrade from schema version 2.
case 2:
- // Once the SQLite version is >= 3.25.0 `ALTER TABLE RENAME` can be used. https://www.sqlite.org/lang_altertable.html https://www.sqlite.org/changes.html
+ // Once the SQLite version is >= 3.25.0 `ALTER TABLE RENAME COLUMN` can be used. https://www.sqlite.org/lang_altertable.html https://www.sqlite.org/changes.html
// https://developer.android.com/reference/android/database/sqlite/package-summary
// In the meantime, we can create a new column with the new name. There is no need to delete the old column on the temporary import database.
// Import the preference data.
sharedPreferences.edit()
- .putBoolean("javascript_enabled", importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(JAVASCRIPT)) == 1)
- .putBoolean("first_party_cookies_enabled", importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(FIRST_PARTY_COOKIES)) == 1)
- .putBoolean("third_party_cookies_enabled", importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(THIRD_PARTY_COOKIES)) == 1)
- .putBoolean("dom_storage_enabled", importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(DOM_STORAGE)) == 1)
+ .putBoolean(JAVASCRIPT, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(JAVASCRIPT)) == 1)
+ .putBoolean(FIRST_PARTY_COOKIES, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(FIRST_PARTY_COOKIES)) == 1)
+ .putBoolean(THIRD_PARTY_COOKIES, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(THIRD_PARTY_COOKIES)) == 1)
+ .putBoolean(DOM_STORAGE, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(DOM_STORAGE)) == 1)
// Save form data can be removed once the minimum API >= 26.
- .putBoolean("save_form_data_enabled", importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(SAVE_FORM_DATA)) == 1)
+ .putBoolean(SAVE_FORM_DATA, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(SAVE_FORM_DATA)) == 1)
.putString(USER_AGENT, importPreferencesCursor.getString(importPreferencesCursor.getColumnIndex(USER_AGENT)))
.putString(CUSTOM_USER_AGENT, importPreferencesCursor.getString(importPreferencesCursor.getColumnIndex(CUSTOM_USER_AGENT)))
.putBoolean(INCOGNITO_MODE, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(INCOGNITO_MODE)) == 1)
.putBoolean(ALLOW_SCREENSHOTS, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(ALLOW_SCREENSHOTS)) == 1)
.putBoolean(EASYLIST, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(EASYLIST)) == 1)
.putBoolean(EASYPRIVACY, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(EASYPRIVACY)) == 1)
- .putBoolean("fanboy_annoyance_list", importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(FANBOYS_ANNOYANCE_LIST)) == 1)
- .putBoolean("fanboy_social_blocking_list", importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(FANBOYS_SOCIAL_BLOCKING_LIST)) == 1)
+ .putBoolean(FANBOYS_ANNOYANCE_LIST, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(FANBOYS_ANNOYANCE_LIST)) == 1)
+ .putBoolean(FANBOYS_SOCIAL_BLOCKING_LIST, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(FANBOYS_SOCIAL_BLOCKING_LIST)) == 1)
.putBoolean(ULTRAPRIVACY, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(ULTRAPRIVACY)) == 1)
.putBoolean(BLOCK_ALL_THIRD_PARTY_REQUESTS, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(BLOCK_ALL_THIRD_PARTY_REQUESTS)) == 1)
.putBoolean(PROXY_THROUGH_ORBOT, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndex(PROXY_THROUGH_ORBOT)) == 1)
android:title="@string/privacy" >
<SwitchPreference
- android:key="javascript_enabled"
+ android:key="javascript"
android:title="@string/javascript_preference"
android:summary="@string/javascript_preference_summary"
android:defaultValue="false" />
<SwitchPreference
- android:key="first_party_cookies_enabled"
+ android:key="first_party_cookies"
android:title="@string/first_party_cookies_preference"
android:summary="@string/first_party_cookies_preference_summary"
android:defaultValue="false" />
<SwitchPreference
- android:key="third_party_cookies_enabled"
+ android:key="third_party_cookies"
android:title="@string/third_party_cookies_preference"
android:summary="@string/third_party_cookies_summary"
android:defaultValue="false" />
<SwitchPreference
- android:key="dom_storage_enabled"
+ android:key="dom_storage"
android:title="@string/dom_storage_preference"
android:summary="@string/dom_storage_preference_summary"
android:defaultValue="false" />
<!-- Save form data can be removed once the minimum API >= 26. -->
<SwitchPreference
- android:key="save_form_data_enabled"
+ android:key="save_form_data"
android:title="@string/save_form_data_preference"
android:summary="@string/save_form_data_preference_summary"
android:defaultValue="false" />
android:defaultValue="true" />
<SwitchPreference
- android:key="fanboy_annoyance_list"
+ android:key="fanboys_annoyance_list"
android:title="@string/fanboys_annoyance_list"
android:summary="@string/fanboys_annoyance_list_summary"
android:defaultValue="true" />
<SwitchPreference
- android:key="fanboy_social_blocking_list"
+ android:key="fanboys_social_blocking_list"
android:title="@string/fanboys_social_blocking_list"
android:summary="@string/fanboys_social_blocking_list_summary"
android:defaultValue="true" />
projects / PrivacyBrowserAndroid.git / commitdiff
