/*
- * Copyright © 2017-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2022 Soren Stoutner <soren@stoutner.com>.
*
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
*
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android. If not, see <http://www.gnu.org/licenses/>.
*/
package com.stoutner.privacybrowser.activities;
// 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_bottom_appbar);
+ } else {
+ setContentView(R.layout.domains_top_appbar);
+ }
// Populate the class variables.
coordinatorLayout = findViewById(R.id.domains_coordinatorlayout);
@Override
public void bindView(View view, Context context, Cursor cursor) {
// Get the domain name string.
- String domainNameString = cursor.getString(cursor.getColumnIndex(DomainsDatabaseHelper.DOMAIN_NAME));
+ String domainNameString = cursor.getString(cursor.getColumnIndexOrThrow(DomainsDatabaseHelper.DOMAIN_NAME));
// Get a handle for the domain name text view.
TextView domainNameTextView = view.findViewById(R.id.domain_name_textview);
@Override
public void bindView(View view, Context context, Cursor cursor) {
/// Get the domain name string.
- String domainNameString = cursor.getString(cursor.getColumnIndex(DomainsDatabaseHelper.DOMAIN_NAME));
+ String domainNameString = cursor.getString(cursor.getColumnIndexOrThrow(DomainsDatabaseHelper.DOMAIN_NAME));
// Get a handle for the domain name text view.
TextView domainNameTextView = view.findViewById(R.id.domain_name_textview);
// 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);
@Override
public void bindView(View view, Context context, Cursor cursor) {
// Set the domain name.
- String domainNameString = cursor.getString(cursor.getColumnIndex(DomainsDatabaseHelper.DOMAIN_NAME));
+ String domainNameString = cursor.getString(cursor.getColumnIndexOrThrow(DomainsDatabaseHelper.DOMAIN_NAME));
TextView domainNameTextView = view.findViewById(R.id.domain_name_textview);
domainNameTextView.setText(domainNameString);
}
domainsCursor.moveToPosition(i);
// Get the database ID for this position.
- int currentDatabaseId = domainsCursor.getInt(domainsCursor.getColumnIndex(DomainsDatabaseHelper._ID));
+ int currentDatabaseId = domainsCursor.getInt(domainsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper._ID));
// Set `highlightedDomainPosition` if the database ID for this matches `highlightedDomainDatabaseId`.
if (highlightedDomainDatabaseId == currentDatabaseId) {
// Get the database ID for the highlighted domain.
domainsCursor.moveToPosition(highlightedDomainPosition);
- currentDomainDatabaseId = domainsCursor.getInt(domainsCursor.getColumnIndex(DomainsDatabaseHelper._ID));
+ currentDomainDatabaseId = domainsCursor.getInt(domainsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper._ID));
// Create an arguments bundle.
Bundle argumentsBundle = new Bundle();
projects / PrivacyBrowserAndroid.git / blobdiff