/*
- * Copyright © 2017-2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2020 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.database.Cursor;
import android.os.Bundle;
import android.widget.Switch;
import android.widget.TextView;
+import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; // The AndroidX toolbar must be used until the minimum API is >= 21.
// Get a handle for the shared preferences.
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
- // Get the theme and screenshot preferences.
- boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false);
+ // Get the screenshot preference.
boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false);
// Disable screenshots if not allowed.
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
- // Set the activity theme.
- if (darkTheme) {
- setTheme(R.style.PrivacyBrowserDark_SecondaryActivity);
- } else {
- setTheme(R.style.PrivacyBrowserLight_SecondaryActivity);
- }
+ // Set the theme.
+ setTheme(R.style.PrivacyBrowser);
// Run the default commands.
super.onCreate(savedInstanceState);
// Configure the add domain floating action button.
addDomainFAB.setOnClickListener((View view) -> {
+ // Remove the incorrect warning below that the current URL might be null.
+ assert currentUrl != null;
+
// Create an add domain dialog.
DialogFragment addDomainDialog = AddDomainDialog.addDomain(currentUrl);
// Disable the options `MenuItems`.
deleteMenuItem.setEnabled(false);
- deleteMenuItem.setIcon(R.drawable.delete_blue);
+ deleteMenuItem.setIcon(R.drawable.delete_disabled);
// Remove the domain settings fragment.
fragmentManager.beginTransaction().remove(Objects.requireNonNull(fragmentManager.findFragmentById(R.id.domain_settings_fragment_container))).commit();
// Get a handle for the activity.
Activity activity = this;
- // Display a `Snackbar`.
+ // Display a snackbar.
undoDeleteSnackbar = Snackbar.make(domainsListView, R.string.domain_deleted, Snackbar.LENGTH_LONG)
.setAction(R.string.undo, (View v) -> {
// Do nothing because everything will be handled by `onDismissed()` below.
}
};
- // Update the `ListView`.
+ // Update the domains list view.
domainsListView.setAdapter(undoDeleteDomainsCursorAdapter);
- // Select the previously deleted domain in `domainsListView`.
+
+ // Select the previously deleted domain in the list view.
domainsListView.setItemChecked(deletedDomainPosition, true);
- // Display `domainSettingsFragment`.
+ // Display the domain settings fragment.
fragmentManager.beginTransaction().replace(R.id.domain_settings_fragment_container, domainSettingsFragment).commit();
- // Enable the options `MenuItems`.
+ // Enable the options delete menu item.
deleteMenuItem.setEnabled(true);
- deleteMenuItem.setIcon(R.drawable.delete_light);
+
+ // Get the current theme status.
+ int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+
+ // Set the delete menu item icon according to the theme.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+ deleteMenuItem.setIcon(R.drawable.delete_night);
+ } else {
+ deleteMenuItem.setIcon(R.drawable.delete_day);
+ }
} else { // The device in in one-paned mode.
// Display `domainSettingsFragment`.
fragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit();
if (dismissingSnackbar) {
// Create a `Runnable` to enable the delete menu item.
Runnable enableDeleteMenuItemRunnable = () -> {
- // Enable `deleteMenuItem` according to the display mode.
+ // Enable the delete menu item according to the display mode.
if (twoPanedMode) { // Two-paned mode.
// Enable the delete menu item.
deleteMenuItem.setEnabled(true);
- // Get a handle for the shared preferences.
- SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+ // Get the current theme status.
+ int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
- // Get the theme preferences.
- boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false);
-
- // Set the delete icon according to the theme.
- if (darkTheme) {
- deleteMenuItem.setIcon(R.drawable.delete_dark);
+ // Set the delete menu item icon according to the theme.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+ deleteMenuItem.setIcon(R.drawable.delete_night);
} else {
- deleteMenuItem.setIcon(R.drawable.delete_light);
+ deleteMenuItem.setIcon(R.drawable.delete_day);
}
} else { // Single-paned mode.
- // Show `deleteMenuItem`.
+ // Show the delete menu item.
deleteMenuItem.setVisible(true);
}
- // Reset `dismissingSnackbar`.
+ // Reset the dismissing snackbar tracker.
dismissingSnackbar = false;
};
}
@Override
- protected void onSaveInstanceState(Bundle outState) {
+ protected void onSaveInstanceState(@NonNull Bundle outState) {
// Store the current `DomainSettingsFragment` state in `outState`.
if (findViewById(R.id.domain_settings_scrollview) != null) { // `DomainSettingsFragment` is displayed.
// Save any changes that have been made to the domain settings.
}
@Override
- public void onAddDomain(DialogFragment dialogFragment) {
+ public void onAddDomain(@NonNull DialogFragment dialogFragment) {
// Dismiss the undo delete snackbar if it is currently displayed.
if ((undoDeleteSnackbar != null) && undoDeleteSnackbar.isShown()) {
undoDeleteSnackbar.dismiss();
}
- // Get the new domain name String from the dialog fragment.
+ // Remove the incorrect lint warning below that the dialog might be null.
+ assert dialogFragment.getDialog() != null;
+
+ // Get a handle for the domain name edit text.
EditText domainNameEditText = dialogFragment.getDialog().findViewById(R.id.domain_name_edittext);
+
+ // Get the domain name string.
String domainNameString = domainNameEditText.getText().toString();
// Create the domain and store the database ID in `currentDomainDatabaseId`.
Switch easyPrivacySwitch = view.findViewById(R.id.easyprivacy_switch);
Switch fanboysAnnoyanceSwitch = view.findViewById(R.id.fanboys_annoyance_list_switch);
Switch fanboysSocialBlockingSwitch = view.findViewById(R.id.fanboys_social_blocking_list_switch);
+ Switch ultraListSwitch = view.findViewById(R.id.ultralist_switch);
Switch ultraPrivacySwitch = view.findViewById(R.id.ultraprivacy_switch);
Switch blockAllThirdPartyRequestsSwitch = view.findViewById(R.id.block_all_third_party_requests_switch);
Spinner userAgentSpinner = view.findViewById(R.id.user_agent_spinner);
EditText customUserAgentEditText = view.findViewById(R.id.custom_user_agent_edittext);
Spinner fontSizeSpinner = view.findViewById(R.id.font_size_spinner);
+ EditText customFontSizeEditText = view.findViewById(R.id.custom_font_size_edittext);
Spinner swipeToRefreshSpinner = view.findViewById(R.id.swipe_to_refresh_spinner);
Spinner nightModeSpinner = view.findViewById(R.id.night_mode_spinner);
Spinner wideViewportSpinner = view.findViewById(R.id.wide_viewport_spinner);
// Extract the data for the domain settings.
String domainNameString = domainNameEditText.getText().toString();
- boolean javaScriptEnabled = javaScriptSwitch.isChecked();
- boolean firstPartyCookiesEnabled = firstPartyCookiesSwitch.isChecked();
- boolean thirdPartyCookiesEnabled = thirdPartyCookiesSwitch.isChecked();
- boolean domStorageEnabled = domStorageSwitch.isChecked();
- boolean formDataEnabled = formDataSwitch.isChecked(); // Form data can be removed once the minimum API >= 26.
- boolean easyListEnabled = easyListSwitch.isChecked();
- boolean easyPrivacyEnabled = easyPrivacySwitch.isChecked();
- boolean fanboysAnnoyanceEnabled = fanboysAnnoyanceSwitch.isChecked();
- boolean fanboysSocialBlockingEnabled = fanboysSocialBlockingSwitch.isChecked();
- boolean ultraPrivacyEnabled = ultraPrivacySwitch.isChecked();
+ boolean javaScript = javaScriptSwitch.isChecked();
+ boolean firstPartyCookies = firstPartyCookiesSwitch.isChecked();
+ boolean thirdPartyCookies = thirdPartyCookiesSwitch.isChecked();
+ boolean domStorage = domStorageSwitch.isChecked();
+ boolean formData = formDataSwitch.isChecked(); // Form data can be removed once the minimum API >= 26.
+ boolean easyList = easyListSwitch.isChecked();
+ boolean easyPrivacy = easyPrivacySwitch.isChecked();
+ boolean fanboysAnnoyance = fanboysAnnoyanceSwitch.isChecked();
+ boolean fanboysSocialBlocking = fanboysSocialBlockingSwitch.isChecked();
+ boolean ultraList = ultraListSwitch.isChecked();
+ boolean ultraPrivacy = ultraPrivacySwitch.isChecked();
boolean blockAllThirdPartyRequests = blockAllThirdPartyRequestsSwitch.isChecked();
- int userAgentPosition = userAgentSpinner.getSelectedItemPosition();
- int fontSizePosition = fontSizeSpinner.getSelectedItemPosition();
+ int userAgentSwitchPosition = userAgentSpinner.getSelectedItemPosition();
+ int fontSizeSwitchPosition = fontSizeSpinner.getSelectedItemPosition();
int swipeToRefreshInt = swipeToRefreshSpinner.getSelectedItemPosition();
int nightModeInt = nightModeSpinner.getSelectedItemPosition();
int wideViewportInt = wideViewportSpinner.getSelectedItemPosition();
String userAgentName;
// Set the user agent name.
- switch (userAgentPosition) {
+ switch (userAgentSwitchPosition) {
case MainWebViewActivity.DOMAINS_SYSTEM_DEFAULT_USER_AGENT:
// Set the user agent name to be `System default user agent`.
userAgentName = resources.getString(R.string.system_default_user_agent);
String[] userAgentNameArray = resources.getStringArray(R.array.user_agent_names);
// Set the user agent name from the array. The domain spinner has one more entry than the name array, so the position must be decremented.
- userAgentName = userAgentNameArray[userAgentPosition - 1];
+ userAgentName = userAgentNameArray[userAgentSwitchPosition - 1];
}
- // Get the font size integer.
- int fontSizeInt = Integer.parseInt(resources.getStringArray(R.array.domain_settings_font_size_entry_values)[fontSizePosition]);
+ // Initialize the font size integer. `0` indicates the system default font size.
+ int fontSizeInt = 0;
+
+ // Use a custom font size if it is selected.
+ if (fontSizeSwitchPosition == 1) { // A custom font size is specified.
+ // Get the custom font size from the edit text.
+ fontSizeInt = Integer.parseInt(customFontSizeEditText.getText().toString());
+ }
// Save the domain settings.
- domainsDatabaseHelper.updateDomain(DomainsActivity.currentDomainDatabaseId, domainNameString, javaScriptEnabled, firstPartyCookiesEnabled, thirdPartyCookiesEnabled,
- domStorageEnabled, formDataEnabled, easyListEnabled, easyPrivacyEnabled, fanboysAnnoyanceEnabled, fanboysSocialBlockingEnabled, ultraPrivacyEnabled, blockAllThirdPartyRequests,
- userAgentName, fontSizeInt, swipeToRefreshInt, nightModeInt, wideViewportInt, displayWebpageImagesInt, pinnedSslCertificate, pinnedIpAddress);
+ domainsDatabaseHelper.updateDomain(DomainsActivity.currentDomainDatabaseId, domainNameString, javaScript, firstPartyCookies, thirdPartyCookies, domStorage, formData, easyList, easyPrivacy,
+ fanboysAnnoyance, fanboysSocialBlocking, ultraList, ultraPrivacy, blockAllThirdPartyRequests, userAgentName, fontSizeInt, swipeToRefreshInt, nightModeInt, wideViewportInt,
+ displayWebpageImagesInt, pinnedSslCertificate, pinnedIpAddress);
// Update the pinned SSL certificate if a new one is checked.
if (currentWebsiteCertificateRadioButton.isChecked()) {
}
};
- // Update the `ListView`.
+ // Update the list view.
domainsListView.setAdapter(domainsCursorAdapter);
// Display the domain settings in the second pane if operating in two pane mode and the database contains at least one domain.
// Enable the delete options menu items.
deleteMenuItem.setEnabled(true);
- // Get a handle for the shared preferences.
- SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-
- // Get the theme and screenshot preferences.
- boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false);
+ // Get the current theme status.
+ int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
// Set the delete icon according to the theme.
- if (darkTheme) {
- deleteMenuItem.setIcon(R.drawable.delete_dark);
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+ deleteMenuItem.setIcon(R.drawable.delete_night);
} else {
- deleteMenuItem.setIcon(R.drawable.delete_light);
+ deleteMenuItem.setIcon(R.drawable.delete_day);
}
} else if (twoPanedMode) { // Two-paned mode is enabled but there are no domains.
// Disable the options `MenuItems`.
deleteMenuItem.setEnabled(false);
- deleteMenuItem.setIcon(R.drawable.delete_blue);
+ deleteMenuItem.setIcon(R.drawable.delete_disabled);
}
}
projects / PrivacyBrowserAndroid.git / blobdiff