/*
- * Copyright © 2017-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2021 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
// Get a handle for the shared preferences.
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
- // Get the screenshot preference.
- boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false);
+ // Get the preferences.
+ boolean allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false);
+ boolean bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false);
// Disable screenshots if not allowed.
if (!allowScreenshots) {
sslEndDateLong = intent.getLongExtra("ssl_end_date", 0);
currentIpAddresses = intent.getStringExtra("current_ip_addresses");
- // Set the content view.
- setContentView(R.layout.domains_coordinatorlayout);
+ // Set the view.
+ if (bottomAppBar) {
+ setContentView(R.layout.domains_coordinatorlayout_bottom_appbar);
+ } else {
+ setContentView(R.layout.domains_coordinatorlayout_top_appbar);
+ }
// Populate the class variables.
coordinatorLayout = findViewById(R.id.domains_coordinatorlayout);
// Get handles for the domain settings.
EditText domainNameEditText = view.findViewById(R.id.domain_settings_name_edittext);
SwitchCompat javaScriptSwitch = view.findViewById(R.id.javascript_switch);
- SwitchCompat firstPartyCookiesSwitch = view.findViewById(R.id.first_party_cookies_switch);
- SwitchCompat thirdPartyCookiesSwitch = view.findViewById(R.id.third_party_cookies_switch);
+ SwitchCompat cookiesSwitch = view.findViewById(R.id.cookies_switch);
SwitchCompat domStorageSwitch = view.findViewById(R.id.dom_storage_switch);
SwitchCompat formDataSwitch = view.findViewById(R.id.form_data_switch); // Form data can be removed once the minimum API >= 26.
SwitchCompat easyListSwitch = view.findViewById(R.id.easylist_switch);
// Extract the data for the domain settings.
String domainNameString = domainNameEditText.getText().toString();
boolean javaScript = javaScriptSwitch.isChecked();
- boolean firstPartyCookies = firstPartyCookiesSwitch.isChecked();
- boolean thirdPartyCookies = thirdPartyCookiesSwitch.isChecked();
+ boolean cookies = cookiesSwitch.isChecked();
boolean domStorage = domStorageSwitch.isChecked();
boolean formData = formDataSwitch.isChecked(); // Form data can be removed once the minimum API >= 26.
boolean easyList = easyListSwitch.isChecked();
}
// Save the domain settings.
- domainsDatabaseHelper.updateDomain(DomainsActivity.currentDomainDatabaseId, domainNameString, javaScript, firstPartyCookies, thirdPartyCookies, domStorage, formData, easyList, easyPrivacy,
+ domainsDatabaseHelper.updateDomain(DomainsActivity.currentDomainDatabaseId, domainNameString, javaScript, cookies, domStorage, formData, easyList, easyPrivacy,
fanboysAnnoyance, fanboysSocialBlocking, ultraList, ultraPrivacy, blockAllThirdPartyRequests, userAgentName, fontSizeInt, swipeToRefreshInt, webViewThemeInt, wideViewportInt,
displayWebpageImagesInt, pinnedSslCertificate, pinnedIpAddress);