/*
- * Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2018 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
package com.stoutner.privacybrowser.activities;
+import android.app.Activity;
import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
import android.database.Cursor;
import android.net.http.SslCertificate;
import android.os.Bundle;
import android.support.v4.app.NavUtils;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
+// `AppCompatDialogFragment` is required instead of `DialogFragment` or an error is produced on API <=22.
import android.support.v7.app.AppCompatDialogFragment;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.view.WindowManager;
import android.widget.CursorAdapter;
import android.widget.EditText;
import android.widget.ListView;
import com.stoutner.privacybrowser.fragments.DomainsListFragment;
import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper;
+import java.util.Objects;
+
public class DomainsActivity extends AppCompatActivity implements AddDomainDialog.AddDomainListener {
// `twoPanedMode` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `populateDomainsListView()`.
public static boolean twoPanedMode;
// `deleteMenuItem` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreateOptionsMenu()`, `onOptionsItemSelected()`, and `onBackPressed()`.
public static MenuItem deleteMenuItem;
- // `undoDeleteSnackbar` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onOptionsItemSelected()`.
+ // `undoDeleteSnackbar` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onOptionsItemSelected()` and `onBackPressed()`.
public static Snackbar undoDeleteSnackbar;
// `dismissingSnackbar` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onOptionsItemSelected()`.
public static boolean dismissingSnackbar;
+ // `closeActivityAfterDismissingSnackbar` is used in `onOptionsItemSelected()`, and `onBackPressed()`.
+ private boolean closeActivityAfterDismissingSnackbar;
+
// `context` is used in `onCreate()`, `onOptionsItemSelected()`, and `onAddDomain()`.
private Context context;
// `supportFragmentManager` is used in `onCreate()` and `onCreateOptionsMenu()`.
private FragmentManager supportFragmentManager;
- // `domainsDatabaseHelper` is used in `onCreate()` and `saveDomainSettings()`.
+ // `domainsDatabaseHelper` is used in `onCreate()`, `saveDomainSettings()`, and `onDestroy()`.
private static DomainsDatabaseHelper domainsDatabaseHelper;
// `domainsListView` is used in `onCreate()` and `populateDomainsList()`.
// `domainSettingsDatabaseIdBeforeRotate` is used in `onCreate()` and `onCreateOptionsMenu()`.
private int domainSettingsDatabaseIdBeforeRotate;
+ // `goDirectlyToDatabaseId` is used in `onCreate()` and `onCreateOptionsMenu()`.
+ private int goDirectlyToDatabaseId;
+
+ // `closeOnBack` is used in `onCreate()`, `onOptionsItemSelected()` and `onBackPressed()`.
+ private boolean closeOnBack;
+
+ // `coordinatorLayout` is use in `onCreate()`, `onOptionsItemSelected()`, and `onSaveInstanceState()`.
+ private View coordinatorLayout;
+
+ // `resources` is used in `onCreate()`, `onOptionsItemSelected()`, and `onSaveInstanceState()`.
+ private Resources resources;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
+ // Disable screenshots if not allowed.
+ if (!MainWebViewActivity.allowScreenshots) {
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+ }
+
// Set the activity theme.
if (MainWebViewActivity.darkTheme) {
setTheme(R.style.PrivacyBrowserDark_SecondaryActivity);
domainSettingsDatabaseIdBeforeRotate = savedInstanceState.getInt("domainSettingsDatabaseId");
}
+ // Get the launching intent
+ Intent intent = getIntent();
+
+ // Extract the domain to load if there is one. `-1` is the default value.
+ goDirectlyToDatabaseId = intent.getIntExtra("loadDomain", -1);
+
+ // Get the status of close-on-back, which is true when the domains activity is called from the options menu.
+ closeOnBack = intent.getBooleanExtra("closeOnBack", false);
+
// Set the content view.
setContentView(R.layout.domains_coordinatorlayout);
- // Get a handle for the context.
+ // Populate the class variables.
+ coordinatorLayout = findViewById(R.id.domains_coordinatorlayout);
+ resources = getResources();
context = this;
-
- // Get a handle for the fragment manager.
supportFragmentManager = getSupportFragmentManager();
- // We need to use the `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21.
- final Toolbar domainsAppBar = (Toolbar) findViewById(R.id.domains_toolbar);
+ // `SupportActionBar` from `android.support.v7.app.ActionBar` must be used until the minimum API is >= 21.
+ final Toolbar domainsAppBar = findViewById(R.id.domains_toolbar);
setSupportActionBar(domainsAppBar);
- // Display the home arrow on `SupportActionBar`.
+ // Display the home arrow on the support action bar.
ActionBar appBar = getSupportActionBar();
assert appBar != null;// This assert removes the incorrect warning in Android Studio on the following line that `appBar` might be null.
appBar.setDisplayHomeAsUpEnabled(true);
- // Initialize the database handler. The two `nulls` do not specify the database name or a `CursorFactory`. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`.
+ // Initialize the database handler. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`.
domainsDatabaseHelper = new DomainsDatabaseHelper(context, null, null, 0);
// Determine if we are in two pane mode. `domain_settings_fragment_container` does not exist on devices with a width less than 900dp.
twoPanedMode = (findViewById(R.id.domain_settings_fragment_container) != null);
// Configure `addDomainFAB`.
- addDomainFAB = (FloatingActionButton) findViewById(R.id.add_domain_fab);
- addDomainFAB.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- // Show the `AddDomainDialog` `AlertDialog` and name the instance `@string/add_domain`.
- AppCompatDialogFragment addDomainDialog = new AddDomainDialog();
- addDomainDialog.show(supportFragmentManager, getResources().getString(R.string.add_domain));
- }
+ addDomainFAB = findViewById(R.id.add_domain_fab);
+ addDomainFAB.setOnClickListener((View view) -> {
+ // Show the add domain `AlertDialog`.
+ AppCompatDialogFragment addDomainDialog = new AddDomainDialog();
+ addDomainDialog.show(supportFragmentManager, resources.getString(R.string.add_domain));
});
}
deleteMenuItem.setVisible(twoPanedMode);
// Display the fragments. This must be done from `onCreateOptionsMenu()` instead of `onCreate()` because `populateDomainsListView()` needs `deleteMenuItem` to be inflated.
- if (restartAfterRotate && !twoPanedMode && domainSettingsDisplayedBeforeRotate) { // The device was rotated, the new configuration is in single-paned mode, and domain settings were displayed previously.
- // Reset `restartAfterRotate`.
- restartAfterRotate = false;
+ if (restartAfterRotate && domainSettingsDisplayedBeforeRotate) { // The device was rotated and domain settings were displayed previously.
+ if (twoPanedMode) { // The device is in two-paned mode.
+ // Reset `restartAfterRotate`.
+ restartAfterRotate = false;
- // Store `currentDomainDatabaseId`.
- currentDomainDatabaseId = domainSettingsDatabaseIdBeforeRotate;
+ // Display `DomainsListFragment`.
+ DomainsListFragment domainsListFragment = new DomainsListFragment();
+ supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit();
+ supportFragmentManager.executePendingTransactions();
- // Add `currentDomainDatabaseId` to `argumentsBundle`.
- Bundle argumentsBundle = new Bundle();
- argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, currentDomainDatabaseId);
+ // Populate the list of domains. `domainSettingsDatabaseId` highlights the domain that was highlighted before the rotation.
+ populateDomainsListView(domainSettingsDatabaseIdBeforeRotate);
+ } else { // The device is in single-paned mode.
+ // Reset `restartAfterRotate`.
+ restartAfterRotate = false;
- // Add `argumentsBundle` to `domainSettingsFragment`.
- DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment();
- domainSettingsFragment.setArguments(argumentsBundle);
+ // Store the current domain database ID.
+ currentDomainDatabaseId = domainSettingsDatabaseIdBeforeRotate;
- // Show `deleteMenuItem`.
- deleteMenuItem.setVisible(true);
+ // Add `currentDomainDatabaseId` to `argumentsBundle`.
+ Bundle argumentsBundle = new Bundle();
+ argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, currentDomainDatabaseId);
- // Hide `add_domain_fab`.
- addDomainFAB.setVisibility(View.GONE);
+ // Add `argumentsBundle` to `domainSettingsFragment`.
+ DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment();
+ domainSettingsFragment.setArguments(argumentsBundle);
- // Display `domainSettingsFragment`.
- supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit();
- } else if (restartAfterRotate && twoPanedMode && domainSettingsDisplayedBeforeRotate) { // The device was rotated, the new configuration is in two-paned mode, and domain settings were displayed previously.
- // Reset `restartAfterRotate`.
- restartAfterRotate = false;
+ // Show `deleteMenuItem`.
+ deleteMenuItem.setVisible(true);
- // Display `DomainsListFragment`.
- DomainsListFragment domainsListFragment = new DomainsListFragment();
- supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit();
- supportFragmentManager.executePendingTransactions();
+ // Hide `add_domain_fab`.
+ addDomainFAB.setVisibility(View.GONE);
- // Populate the list of domains. `domainSettingsDatabaseId` highlights the domain that was highlighted before the rotation.
- populateDomainsListView(domainSettingsDatabaseIdBeforeRotate);
+ // Display `domainSettingsFragment`.
+ supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit();
+ }
} else { // The device was not rotated or, if it was, domain settings were not displayed previously.
- // Display `DomainsListFragment`.
- DomainsListFragment domainsListFragment = new DomainsListFragment();
- supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit();
- supportFragmentManager.executePendingTransactions();
+ if (goDirectlyToDatabaseId >=0) { // Load the indicated domain settings.
+ // Store the current domain database ID.
+ currentDomainDatabaseId = goDirectlyToDatabaseId;
- // Populate the list of domains. `-1` highlights the first domain.
- populateDomainsListView(-1);
+ if (twoPanedMode) { // The device is in two-paned mode.
+ // Display `DomainsListFragment`.
+ DomainsListFragment domainsListFragment = new DomainsListFragment();
+ supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit();
+ supportFragmentManager.executePendingTransactions();
+
+ // Populate the list of domains. `domainSettingsDatabaseId` highlights the domain that was highlighted before the rotation.
+ populateDomainsListView(goDirectlyToDatabaseId);
+ } else { // The device is in single-paned mode.
+ // Add the domain ID to be loaded to `argumentsBundle`.
+ Bundle argumentsBundle = new Bundle();
+ argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, goDirectlyToDatabaseId);
+
+ // Add `argumentsBundle` to `domainSettingsFragment`.
+ DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment();
+ domainSettingsFragment.setArguments(argumentsBundle);
+
+ // Show `deleteMenuItem`.
+ deleteMenuItem.setVisible(true);
+
+ // Hide `add_domain_fab`.
+ addDomainFAB.setVisibility(View.GONE);
+
+ // Display `domainSettingsFragment`.
+ supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit();
+ }
+ } else { // Highlight the first domain.
+ // Display `DomainsListFragment`.
+ DomainsListFragment domainsListFragment = new DomainsListFragment();
+ supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit();
+ supportFragmentManager.executePendingTransactions();
+
+ // Populate the list of domains. `-1` highlights the first domain.
+ populateDomainsListView(-1);
+ }
}
// Success!
if (twoPanedMode) { // The device is in two-paned mode.
// Save the current domain settings if the domain settings fragment is displayed.
if (findViewById(R.id.domain_settings_scrollview) != null) {
- saveDomainSettings();
+ saveDomainSettings(coordinatorLayout, resources);
}
+ // Dismiss the undo delete `SnackBar` if it is shown.
+ if (undoDeleteSnackbar != null && undoDeleteSnackbar.isShown()) {
+ // Set the close flag.
+ closeActivityAfterDismissingSnackbar = true;
+
+ // Dismiss the snackbar.
+ undoDeleteSnackbar.dismiss();
+ } else {
+ // Go home.
+ NavUtils.navigateUpFromSameTask(this);
+ }
+ } else if (closeOnBack) { // Go directly back to the main WebView activity because the domains activity was launched from the options menu.
+ // Save the current domain settings.
+ saveDomainSettings(coordinatorLayout, resources);
+
// Go home.
NavUtils.navigateUpFromSameTask(this);
- } else if (findViewById(R.id.domain_settings_scrollview) != null) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed.
+ } else if (findViewById(R.id.domain_settings_scrollview) != null) { // The device is in single-paned mode and the domain settings fragment is displayed.
// Save the current domain settings.
- saveDomainSettings();
+ saveDomainSettings(coordinatorLayout, resources);
- // Display `DomainsListFragment`.
+ // Display the domains list fragment.
DomainsListFragment domainsListFragment = new DomainsListFragment();
supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit();
supportFragmentManager.executePendingTransactions();
// Populate the list of domains. `-1` highlights the first domain if in two-paned mode. It has no effect in single-paned mode.
populateDomainsListView(-1);
- // Display `addDomainFAB`.
+ // Display the add domain FAB.
addDomainFAB.setVisibility(View.VISIBLE);
- // Hide `deleteMenuItem`.
+ // Hide the delete menu item.
deleteMenuItem.setVisible(false);
} else { // The device is in single-paned mode and `DomainsListFragment` is displayed.
- // Go home.
- NavUtils.navigateUpFromSameTask(this);
+ // Dismiss the undo delete `SnackBar` if it is shown.
+ if (undoDeleteSnackbar != null && undoDeleteSnackbar.isShown()) {
+ // Set the close flag.
+ closeActivityAfterDismissingSnackbar = true;
+
+ // Dismiss the snackbar.
+ undoDeleteSnackbar.dismiss();
+ } else {
+ // Go home.
+ NavUtils.navigateUpFromSameTask(this);
+ }
}
break;
case R.id.delete_domain:
+ // Reset close-on-back, which otherwise can cause errors if the system attempts to save settings for a domain that no longer exists.
+ closeOnBack = false;
+
// Store a copy of `currentDomainDatabaseId` because it could change while the `Snackbar` is displayed.
final int databaseIdToDelete = currentDomainDatabaseId;
deleteMenuItem.setIcon(R.drawable.delete_blue);
// Remove the domain settings fragment.
- supportFragmentManager.beginTransaction().remove(supportFragmentManager.findFragmentById(R.id.domain_settings_fragment_container)).commit();
+ supportFragmentManager.beginTransaction().remove(Objects.requireNonNull(supportFragmentManager.findFragmentById(R.id.domain_settings_fragment_container))).commit();
} else { // Single-paned mode.
// Display `DomainsListFragment`.
DomainsListFragment domainsListFragment = new DomainsListFragment();
public void bindView(View view, Context context, Cursor cursor) {
// Set the domain name.
String domainNameString = cursor.getString(cursor.getColumnIndex(DomainsDatabaseHelper.DOMAIN_NAME));
- TextView domainNameTextView = (TextView) view.findViewById(R.id.domain_name_textview);
+ TextView domainNameTextView = view.findViewById(R.id.domain_name_textview);
domainNameTextView.setText(domainNameString);
}
};
// Update the handle for the current `domains_listview`.
- domainsListView = (ListView) findViewById(R.id.domains_listview);
+ domainsListView = findViewById(R.id.domains_listview);
// Update the `ListView`.
domainsListView.setAdapter(domainsPendingDeleteCursorAdapter);
+ // Get a handle for the activity.
+ Activity activity = this;
+
// Display a `Snackbar`.
undoDeleteSnackbar = Snackbar.make(domainsListView, R.string.domain_deleted, Snackbar.LENGTH_LONG)
- .setAction(R.string.undo, new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- // Do nothing because everything will be handled by `onDismissed()` below.
- }
+ .setAction(R.string.undo, (View v) -> {
+ // Do nothing because everything will be handled by `onDismissed()` below.
})
.addCallback(new Snackbar.Callback() {
@Override
public void bindView(View view, Context context, Cursor cursor) {
// Set the domain name.
String domainNameString = cursor.getString(cursor.getColumnIndex(DomainsDatabaseHelper.DOMAIN_NAME));
- TextView domainNameTextView = (TextView) view.findViewById(R.id.domain_name_textview);
+ TextView domainNameTextView = view.findViewById(R.id.domain_name_textview);
domainNameTextView.setText(domainNameString);
}
};
supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit();
// Hide `add_domain_fab`.
- FloatingActionButton addDomainFAB = (FloatingActionButton) findViewById(R.id.add_domain_fab);
+ FloatingActionButton addDomainFAB = findViewById(R.id.add_domain_fab);
addDomainFAB.setVisibility(View.GONE);
// Show and enable `deleteMenuItem`.
// Delete the selected domain.
domainsDatabaseHelper.deleteDomain(databaseIdToDelete);
- // enable `deleteMenuItem` if the system was waiting for a `Snackbar` to be dismissed.
- if (DomainsActivity.dismissingSnackbar) {
+ // Enable the delete menu item if the system was waiting for a snackbar to be dismissed.
+ if (dismissingSnackbar) {
// Create a `Runnable` to enable the delete menu item.
- Runnable enableDeleteMenuItemRunnable = new Runnable() {
- @Override
- public void run() {
- // Enable `deleteMenuItem` according to the display mode.
- if (twoPanedMode) { // Two-paned mode.
- // Enable `deleteMenuItem`.
- deleteMenuItem.setEnabled(true);
-
- // Set the delete icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
- deleteMenuItem.setIcon(R.drawable.delete_dark);
- } else {
- deleteMenuItem.setIcon(R.drawable.delete_light);
- }
- } else { // Single-paned mode.
- // Show `deleteMenuItem`.
- deleteMenuItem.setVisible(true);
+ Runnable enableDeleteMenuItemRunnable = () -> {
+ // Enable `deleteMenuItem` according to the display mode.
+ if (twoPanedMode) { // Two-paned mode.
+ // Enable `deleteMenuItem`.
+ deleteMenuItem.setEnabled(true);
+
+ // Set the delete icon according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ deleteMenuItem.setIcon(R.drawable.delete_dark);
+ } else {
+ deleteMenuItem.setIcon(R.drawable.delete_light);
}
-
- // Reset `dismissingSnackbar`.
- dismissingSnackbar = false;
+ } else { // Single-paned mode.
+ // Show `deleteMenuItem`.
+ deleteMenuItem.setVisible(true);
}
+
+ // Reset `dismissingSnackbar`.
+ dismissingSnackbar = false;
};
- // Run `enableDeleteMenuItemRunnable` after 100 milliseconds to make sure that the previous domain has been deleted from the database.
+ // Enable the delete menu icon after 100 milliseconds to make sure that the previous domain has been deleted from the database.
Handler handler = new Handler();
handler.postDelayed(enableDeleteMenuItemRunnable, 100);
}
+
+ // Close the activity if back was pressed.
+ if (closeActivityAfterDismissingSnackbar) {
+ // Go home.
+ NavUtils.navigateUpFromSameTask(activity);
+ }
+
break;
}
}
});
+
+ // Show the Snackbar.
undoDeleteSnackbar.show();
break;
}
// 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.
- saveDomainSettings();
+ saveDomainSettings(coordinatorLayout, resources);
// Store `DomainSettingsDisplayed`.
outState.putBoolean("domainSettingsDisplayed", true);
if (twoPanedMode) { // The device is in two-paned mode.
// Save the current domain settings if the domain settings fragment is displayed.
if (findViewById(R.id.domain_settings_scrollview) != null) {
- saveDomainSettings();
+ saveDomainSettings(coordinatorLayout, resources);
+ }
+
+ // Dismiss the undo delete SnackBar if it is shown.
+ if ((undoDeleteSnackbar != null) && undoDeleteSnackbar.isShown()) {
+ // Set the close flag.
+ closeActivityAfterDismissingSnackbar = true;
+
+ // Dismiss the snackbar.
+ undoDeleteSnackbar.dismiss();
+ } else {
+ // Pass `onBackPressed()` to the system.
+ super.onBackPressed();
}
+ } else if (closeOnBack) { // Go directly back to the main WebView activity because the domains activity was launched from the options menu.
+ // Save the current domain settings.
+ saveDomainSettings(coordinatorLayout, resources);
- // Go home.
- NavUtils.navigateUpFromSameTask(this);
- } else if (findViewById(R.id.domain_settings_scrollview) != null) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed.
+ // Pass `onBackPressed()` to the system.
+ super.onBackPressed();
+ } else if (findViewById(R.id.domain_settings_scrollview) != null) { // The device is in single-paned mode and domain settings fragment is displayed.
// Save the current domain settings.
- saveDomainSettings();
+ saveDomainSettings(coordinatorLayout, resources);
- // Display `DomainsListFragment`.
+ // Display the domains list fragment.
DomainsListFragment domainsListFragment = new DomainsListFragment();
supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit();
supportFragmentManager.executePendingTransactions();
// Populate the list of domains. `-1` highlights the first domain if in two-paned mode. It has no effect in single-paned mode.
populateDomainsListView(-1);
- // Display `addDomainFAB`.
+ // Display the add domain FAB.
addDomainFAB.setVisibility(View.VISIBLE);
- // Hide `deleteMenuItem`.
+ // Hide the delete menu item.
deleteMenuItem.setVisible(false);
- } else { // The device is in single-paned mode and `DomainsListFragment` is displayed.
- // Pass `onBackPressed()` to the system.
- super.onBackPressed();
+ } else { // The device is in single-paned mode and the domain list fragment is displayed.
+ // Dismiss the undo delete SnackBar if it is shown.
+ if ((undoDeleteSnackbar != null) && undoDeleteSnackbar.isShown()) {
+ // Set the close flag.
+ closeActivityAfterDismissingSnackbar = true;
+
+ // Dismiss the snackbar.
+ undoDeleteSnackbar.dismiss();
+ } else {
+ // Pass `onBackPressed()` to the system.
+ super.onBackPressed();
+ }
}
}
@Override
public void onAddDomain(AppCompatDialogFragment dialogFragment) {
- // Dismiss `undoDeleteSnackbar` if it is currently displayed.
- if ((undoDeleteSnackbar != null) && (undoDeleteSnackbar.isShown())) {
+ // Dismiss the undo delete snackbar if it is currently displayed.
+ if ((undoDeleteSnackbar != null) && undoDeleteSnackbar.isShown()) {
undoDeleteSnackbar.dismiss();
}
- // Get the `domainNameEditText` from `dialogFragment` and extract the string.
- EditText domainNameEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.domain_name_edittext);
+ // Get the new domain name String from the dialog fragment.
+ EditText domainNameEditText = dialogFragment.getDialog().findViewById(R.id.domain_name_edittext);
String domainNameString = domainNameEditText.getText().toString();
// Create the domain and store the database ID in `currentDomainDatabaseId`.
}
}
- private void saveDomainSettings() {
+ public void saveDomainSettings(View view, Resources resources) {
// Get handles for the domain settings.
- EditText domainNameEditText = (EditText) findViewById(R.id.domain_settings_name_edittext);
- Switch javaScriptEnabledSwitch = (Switch) findViewById(R.id.domain_settings_javascript_switch);
- Switch firstPartyCookiesEnabledSwitch = (Switch) findViewById(R.id.domain_settings_first_party_cookies_switch);
- Switch thirdPartyCookiesEnabledSwitch = (Switch) findViewById(R.id.domain_settings_third_party_cookies_switch);
- Switch domStorageEnabledSwitch = (Switch) findViewById(R.id.domain_settings_dom_storage_switch);
- Switch formDataEnabledSwitch = (Switch) findViewById(R.id.domain_settings_form_data_switch);
- Spinner userAgentSpinner = (Spinner) findViewById(R.id.domain_settings_user_agent_spinner);
- EditText customUserAgentEditText = (EditText) findViewById(R.id.domain_settings_custom_user_agent_edittext);
- Spinner fontSizeSpinner = (Spinner) findViewById(R.id.domain_settings_font_size_spinner);
- Spinner displayWebpageImagesSpinner = (Spinner) findViewById(R.id.domain_settings_display_webpage_images_spinner);
- Switch pinnedSslCertificateSwitch = (Switch) findViewById(R.id.domain_settings_pinned_ssl_certificate_switch);
- RadioButton savedSslCertificateRadioButton = (RadioButton) findViewById(R.id.saved_ssl_certificate_radiobutton);
- RadioButton currentWebsiteCertificateRadioButton = (RadioButton) findViewById(R.id.current_website_certificate_radiobutton);
+ EditText domainNameEditText = view.findViewById(R.id.domain_settings_name_edittext);
+ Switch javaScriptSwitch = view.findViewById(R.id.domain_settings_javascript_switch);
+ Switch firstPartyCookiesSwitch = view.findViewById(R.id.domain_settings_first_party_cookies_switch);
+ Switch thirdPartyCookiesSwitch = view.findViewById(R.id.domain_settings_third_party_cookies_switch);
+ Switch domStorageSwitch = view.findViewById(R.id.domain_settings_dom_storage_switch);
+ Switch formDataSwitch = view.findViewById(R.id.domain_settings_form_data_switch); // Form data can be removed once the minimum API >= 26.
+ Switch easyListSwitch = view.findViewById(R.id.domain_settings_easylist_switch);
+ Switch easyPrivacySwitch = view.findViewById(R.id.domain_settings_easyprivacy_switch);
+ Switch fanboysAnnoyanceSwitch = view.findViewById(R.id.domain_settings_fanboys_annoyance_list_switch);
+ Switch fanboysSocialBlockingSwitch = view.findViewById(R.id.domain_settings_fanboys_social_blocking_list_switch);
+ Switch ultraPrivacySwitch = view.findViewById(R.id.domain_settings_ultraprivacy_switch);
+ Switch blockAllThirdPartyRequestsSwitch = view.findViewById(R.id.domain_settings_block_all_third_party_requests_switch);
+ Spinner userAgentSpinner = view.findViewById(R.id.domain_settings_user_agent_spinner);
+ EditText customUserAgentEditText = view.findViewById(R.id.domain_settings_custom_user_agent_edittext);
+ Spinner fontSizeSpinner = view.findViewById(R.id.domain_settings_font_size_spinner);
+ Spinner swipeToRefreshSpinner = view.findViewById(R.id.domain_settings_swipe_to_refresh_spinner);
+ Spinner displayWebpageImagesSpinner = view.findViewById(R.id.domain_settings_display_webpage_images_spinner);
+ Spinner nightModeSpinner = view.findViewById(R.id.domain_settings_night_mode_spinner);
+ Switch pinnedSslCertificateSwitch = view.findViewById(R.id.domain_settings_pinned_ssl_certificate_switch);
+ RadioButton savedSslCertificateRadioButton = view.findViewById(R.id.saved_ssl_certificate_radiobutton);
+ RadioButton currentWebsiteCertificateRadioButton = view.findViewById(R.id.current_website_certificate_radiobutton);
// Extract the data for the domain settings.
String domainNameString = domainNameEditText.getText().toString();
- boolean javaScriptEnabledBoolean = javaScriptEnabledSwitch.isChecked();
- boolean firstPartyCookiesEnabledBoolean = firstPartyCookiesEnabledSwitch.isChecked();
- boolean thirdPartyCookiesEnabledBoolean = thirdPartyCookiesEnabledSwitch.isChecked();
- boolean domStorageEnabledEnabledBoolean = domStorageEnabledSwitch.isChecked();
- boolean formDataEnabledBoolean = formDataEnabledSwitch.isChecked();
- int userAgentPositionInt = userAgentSpinner.getSelectedItemPosition();
- int fontSizePositionInt = fontSizeSpinner.getSelectedItemPosition();
+ 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 blockAllThirdPartyRequests = blockAllThirdPartyRequestsSwitch.isChecked();
+ int userAgentPosition = userAgentSpinner.getSelectedItemPosition();
+ int fontSizePosition = fontSizeSpinner.getSelectedItemPosition();
+ int swipeToRefreshInt = swipeToRefreshSpinner.getSelectedItemPosition();
int displayWebpageImagesInt = displayWebpageImagesSpinner.getSelectedItemPosition();
+ int nightModeInt = nightModeSpinner.getSelectedItemPosition();
boolean pinnedSslCertificate = pinnedSslCertificateSwitch.isChecked();
- // Get the data for the `Spinners` from the entry values string arrays.
- String userAgentString = getResources().getStringArray(R.array.domain_settings_user_agent_entry_values)[userAgentPositionInt];
- int fontSizeInt = Integer.parseInt(getResources().getStringArray(R.array.domain_settings_font_size_entry_values)[fontSizePositionInt]);
+ // Initialize the user agent name string.
+ String userAgentName;
+
+ // Set the user agent name.
+ switch (userAgentPosition) {
+ 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);
+ break;
+
+ case MainWebViewActivity.DOMAINS_CUSTOM_USER_AGENT:
+ // Set the user agent name to be the custom user agent.
+ userAgentName = customUserAgentEditText.getText().toString();
+ break;
- // Check to see if we are using a custom user agent.
- if (userAgentString.equals("Custom user agent")) {
- // Set `userAgentString` to the custom user agent string.
- userAgentString = customUserAgentEditText.getText().toString();
+ default:
+ // Get the array of user agent names.
+ 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];
}
+ // Get the font size integer.
+ int fontSizeInt = Integer.parseInt(resources.getStringArray(R.array.domain_settings_font_size_entry_values)[fontSizePosition]);
+
// Save the domain settings.
if (savedSslCertificateRadioButton.isChecked()) { // The current certificate is being used.
// Update the database except for the certificate.
- domainsDatabaseHelper.updateDomainExceptCertificate(DomainsActivity.currentDomainDatabaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean,
- formDataEnabledBoolean, userAgentString, fontSizeInt, displayWebpageImagesInt, pinnedSslCertificate);
+ domainsDatabaseHelper.updateDomainExceptCertificate(DomainsActivity.currentDomainDatabaseId, domainNameString, javaScriptEnabled, firstPartyCookiesEnabled, thirdPartyCookiesEnabled,
+ domStorageEnabled, formDataEnabled, easyListEnabled, easyPrivacyEnabled, fanboysAnnoyanceEnabled, fanboysSocialBlockingEnabled, ultraPrivacyEnabled, blockAllThirdPartyRequests,
+ userAgentName, fontSizeInt, swipeToRefreshInt, nightModeInt, displayWebpageImagesInt, pinnedSslCertificate);
} else if (currentWebsiteCertificateRadioButton.isChecked()) { // The certificate is being updated with the current website certificate.
// Get the current website SSL certificate.
SslCertificate currentWebsiteSslCertificate = MainWebViewActivity.sslCertificate;
long endDateLong = currentWebsiteSslCertificate.getValidNotAfterDate().getTime();
// Update the database.
- domainsDatabaseHelper.updateDomainWithCertificate(currentDomainDatabaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean, formDataEnabledBoolean,
- userAgentString, fontSizeInt, displayWebpageImagesInt, pinnedSslCertificate, issuedToCommonName, issuedToOrganization, issuedToOrganizationalUnit, issuedByCommonName, issuedByOrganization, issuedByOrganizationalUnit, startDateLong,
- endDateLong);
+ domainsDatabaseHelper.updateDomainWithCertificate(currentDomainDatabaseId, domainNameString, javaScriptEnabled, firstPartyCookiesEnabled, thirdPartyCookiesEnabled, domStorageEnabled,
+ formDataEnabled, easyListEnabled, easyPrivacyEnabled, fanboysAnnoyanceEnabled, fanboysSocialBlockingEnabled, ultraPrivacyEnabled, blockAllThirdPartyRequests, userAgentName, fontSizeInt,
+ swipeToRefreshInt, nightModeInt, displayWebpageImagesInt, pinnedSslCertificate, issuedToCommonName, issuedToOrganization, issuedToOrganizationalUnit, issuedByCommonName,
+ issuedByOrganization, issuedByOrganizationalUnit, startDateLong, endDateLong);
+
} else { // No certificate is selected.
// Update the database, with PINNED_SSL_CERTIFICATE set to false.
- domainsDatabaseHelper.updateDomainExceptCertificate(currentDomainDatabaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean, formDataEnabledBoolean,
- userAgentString, fontSizeInt, displayWebpageImagesInt, false);
+ domainsDatabaseHelper.updateDomainExceptCertificate(currentDomainDatabaseId, domainNameString, javaScriptEnabled, firstPartyCookiesEnabled, thirdPartyCookiesEnabled, domStorageEnabled,
+ formDataEnabled, easyListEnabled, easyPrivacyEnabled, fanboysAnnoyanceEnabled, fanboysSocialBlockingEnabled, ultraPrivacyEnabled, blockAllThirdPartyRequests, userAgentName, fontSizeInt,
+ swipeToRefreshInt, nightModeInt, displayWebpageImagesInt,false);
}
}
private void populateDomainsListView(final int highlightedDomainDatabaseId) {
// get a handle for the current `domains_listview`.
- domainsListView = (ListView) findViewById(R.id.domains_listview);
+ domainsListView = findViewById(R.id.domains_listview);
// Get a `Cursor` with the current contents of the domains database.
Cursor domainsCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomain();
public void bindView(View view, Context context, Cursor cursor) {
// Set the domain name.
String domainNameString = cursor.getString(cursor.getColumnIndex(DomainsDatabaseHelper.DOMAIN_NAME));
- TextView domainNameTextView = (TextView) view.findViewById(R.id.domain_name_textview);
+ TextView domainNameTextView = view.findViewById(R.id.domain_name_textview);
domainNameTextView.setText(domainNameString);
}
};
deleteMenuItem.setIcon(R.drawable.delete_blue);
}
}
+
+ @Override
+ public void onDestroy() {
+ // Close the domains database helper.
+ domainsDatabaseHelper.close();
+
+ // Run the default commands.
+ super.onDestroy();
+ }
}
\ No newline at end of file