X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FDomainsActivity.java;h=520e6969c11b3bd30f3638c42b3787f6988d3926;hp=430bf90e3e639dcd98fa68d33d51ad6a9b2a1a86;hb=54c70ca476ba2f53ae274df1ac725be3919e8f56;hpb=6ccecb3374c1988aef2650a87dac20923ce3aa2f diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java index 430bf90e..520e6969 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2018 Soren Stoutner . + * Copyright © 2017-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -19,6 +19,8 @@ package com.stoutner.privacybrowser.activities; +import android.annotation.SuppressLint; +import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -26,19 +28,11 @@ import android.database.Cursor; import android.net.http.SslCertificate; import android.os.Bundle; import android.os.Handler; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.FragmentManager; -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; @@ -47,13 +41,25 @@ import android.widget.Spinner; import android.widget.Switch; import android.widget.TextView; +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. +import androidx.core.app.NavUtils; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentManager; // The AndroidX dialog fragment must be used or an error is produced on API <=22. + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.dialogs.AddDomainDialog; import com.stoutner.privacybrowser.fragments.DomainSettingsFragment; import com.stoutner.privacybrowser.fragments.DomainsListFragment; import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper; -public class DomainsActivity extends AppCompatActivity implements AddDomainDialog.AddDomainListener { +import java.util.Objects; + +public class DomainsActivity extends AppCompatActivity implements AddDomainDialog.AddDomainListener, DomainsListFragment.DismissSnackbarInterface { // `twoPanedMode` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `populateDomainsListView()`. public static boolean twoPanedMode; @@ -63,19 +69,21 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // `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()` 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; - // `context` is used in `onCreate()`, `onOptionsItemSelected()`, and `onAddDomain()`. - private Context context; + // The SSL certificate and current IP addresses are used to update pinned settings. + public static SslCertificate currentSslCertificate; + public static String currentIpAddresses; + + + // `closeActivityAfterDismissingSnackbar` is used in `onOptionsItemSelected()`, and `onBackPressed()`. + private boolean closeActivityAfterDismissingSnackbar; - // `supportFragmentManager` is used in `onCreate()` and `onCreateOptionsMenu()`. - private FragmentManager supportFragmentManager; + // The undelete snackbar is used in `onOptionsItemSelected()` and `onBackPressed()`. + private Snackbar undoDeleteSnackbar; - // `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()`. @@ -110,6 +118,11 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo @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); @@ -123,18 +136,21 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Extract the values from `savedInstanceState` if it is not `null`. if (savedInstanceState != null) { restartAfterRotate = true; - domainSettingsDisplayedBeforeRotate = savedInstanceState.getBoolean("domainSettingsDisplayed"); - domainSettingsDatabaseIdBeforeRotate = savedInstanceState.getInt("domainSettingsDatabaseId"); + domainSettingsDisplayedBeforeRotate = savedInstanceState.getBoolean("domain_settings_displayed"); + domainSettingsDatabaseIdBeforeRotate = savedInstanceState.getInt("domain_settings_database_id"); } // 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); + goDirectlyToDatabaseId = intent.getIntExtra("load_domain", -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); + closeOnBack = intent.getBooleanExtra("close_on_back", false); + + // Get the current URL. + String currentUrl = intent.getStringExtra("current_url"); // Set the content view. setContentView(R.layout.domains_coordinatorlayout); @@ -142,30 +158,36 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Populate the class variables. coordinatorLayout = findViewById(R.id.domains_coordinatorlayout); resources = getResources(); - context = this; - supportFragmentManager = getSupportFragmentManager(); // `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); + final Toolbar toolbar = findViewById(R.id.domains_toolbar); + setSupportActionBar(toolbar); - // Display the home arrow on `SupportActionBar`. - 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); + // Get a handle for the action bar. + ActionBar actionBar = getSupportActionBar(); - // 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`. - domainsDatabaseHelper = new DomainsDatabaseHelper(context, null, null, 0); + // Remove the incorrect lint warning that the action bar might be null. + assert actionBar != null; + + // Set the back arrow on the action bar. + actionBar.setDisplayHomeAsUpEnabled(true); + + // 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(this, 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`. + // Get a handle for the add domain floating action button. addDomainFAB = findViewById(R.id.add_domain_fab); + + // Configure the add domain floating action button. addDomainFAB.setOnClickListener((View view) -> { - // Show the add domain `AlertDialog`. - AppCompatDialogFragment addDomainDialog = new AddDomainDialog(); - addDomainDialog.show(supportFragmentManager, resources.getString(R.string.add_domain)); + // Create an add domain dialog. + DialogFragment addDomainDialog = AddDomainDialog.addDomain(currentUrl); + + // Show the add domain dialog. + addDomainDialog.show(getSupportFragmentManager(), resources.getString(R.string.add_domain)); }); } @@ -180,6 +202,9 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Only display `deleteMenuItem` (initially) in two-paned mode. deleteMenuItem.setVisible(twoPanedMode); + // Get a handle for the fragment manager. + FragmentManager fragmentManager = getSupportFragmentManager(); + // Display the fragments. This must be done from `onCreateOptionsMenu()` instead of `onCreate()` because `populateDomainsListView()` needs `deleteMenuItem` to be inflated. if (restartAfterRotate && domainSettingsDisplayedBeforeRotate) { // The device was rotated and domain settings were displayed previously. if (twoPanedMode) { // The device is in two-paned mode. @@ -188,8 +213,8 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Display `DomainsListFragment`. DomainsListFragment domainsListFragment = new DomainsListFragment(); - supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); - supportFragmentManager.executePendingTransactions(); + fragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + fragmentManager.executePendingTransactions(); // Populate the list of domains. `domainSettingsDatabaseId` highlights the domain that was highlighted before the rotation. populateDomainsListView(domainSettingsDatabaseIdBeforeRotate); @@ -211,11 +236,11 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Show `deleteMenuItem`. deleteMenuItem.setVisible(true); - // Hide `add_domain_fab`. - addDomainFAB.setVisibility(View.GONE); + // Hide the add domain floating action button. + addDomainFAB.hide(); // Display `domainSettingsFragment`. - supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); + fragmentManager.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. if (goDirectlyToDatabaseId >=0) { // Load the indicated domain settings. @@ -225,8 +250,8 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo 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(); + fragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + fragmentManager.executePendingTransactions(); // Populate the list of domains. `domainSettingsDatabaseId` highlights the domain that was highlighted before the rotation. populateDomainsListView(goDirectlyToDatabaseId); @@ -242,17 +267,17 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Show `deleteMenuItem`. deleteMenuItem.setVisible(true); - // Hide `add_domain_fab`. - addDomainFAB.setVisibility(View.GONE); + // Hide the add domain floating action button. + addDomainFAB.hide(); // Display `domainSettingsFragment`. - supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); + fragmentManager.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(); + fragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + fragmentManager.executePendingTransactions(); // Populate the list of domains. `-1` highlights the first domain. populateDomainsListView(-1); @@ -265,9 +290,12 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo @Override public boolean onOptionsItemSelected(MenuItem menuItem) { - // Get the ID of the `MenuItem` that was selected. + // Get the ID of the menu item that was selected. int menuItemID = menuItem.getItemId(); + // Get a handle for the fragment manager. + FragmentManager fragmentManager = getSupportFragmentManager(); + switch (menuItemID) { case android.R.id.home: // The home arrow is identified as `android.R.id.home`, not just `R.id.home`. if (twoPanedMode) { // The device is in two-paned mode. @@ -278,17 +306,11 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Dismiss the undo delete `SnackBar` if it is shown. if (undoDeleteSnackbar != null && undoDeleteSnackbar.isShown()) { - undoDeleteSnackbar.dismiss(); - - // Create a `Runnable` to return to the main activity. - Runnable navigateHomeRunnable = () -> { - // Go home. - NavUtils.navigateUpFromSameTask(this); - }; + // Set the close flag. + closeActivityAfterDismissingSnackbar = true; - // Navigate home after 300 milliseconds to make sure that the previous domain has been deleted from the database. - Handler handler = new Handler(); - handler.postDelayed(navigateHomeRunnable, 300); + // Dismiss the snackbar. + undoDeleteSnackbar.dismiss(); } else { // Go home. NavUtils.navigateUpFromSameTask(this); @@ -305,31 +327,25 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Display the domains list fragment. DomainsListFragment domainsListFragment = new DomainsListFragment(); - supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); - supportFragmentManager.executePendingTransactions(); + fragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + fragmentManager.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 the add domain FAB. - addDomainFAB.setVisibility(View.VISIBLE); + // Show the add domain floating action button. + addDomainFAB.show(); // Hide the delete menu item. deleteMenuItem.setVisible(false); } else { // The device is in single-paned mode and `DomainsListFragment` is displayed. // Dismiss the undo delete `SnackBar` if it is shown. if (undoDeleteSnackbar != null && undoDeleteSnackbar.isShown()) { - undoDeleteSnackbar.dismiss(); - - // Create a `Runnable` to return to the main activity. - Runnable navigateHomeRunnable = () -> { - // Go home. - NavUtils.navigateUpFromSameTask(this); - }; + // Set the close flag. + closeActivityAfterDismissingSnackbar = true; - // Navigate home after 300 milliseconds to make sure that the previous domain has been deleted from the database. - Handler handler = new Handler(); - handler.postDelayed(navigateHomeRunnable, 300); + // Dismiss the snackbar. + undoDeleteSnackbar.dismiss(); } else { // Go home. NavUtils.navigateUpFromSameTask(this); @@ -354,15 +370,15 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo deleteMenuItem.setIcon(R.drawable.delete_blue); // Remove the domain settings fragment. - supportFragmentManager.beginTransaction().remove(supportFragmentManager.findFragmentById(R.id.domain_settings_fragment_container)).commit(); + fragmentManager.beginTransaction().remove(Objects.requireNonNull(fragmentManager.findFragmentById(R.id.domain_settings_fragment_container))).commit(); } else { // Single-paned mode. // Display `DomainsListFragment`. DomainsListFragment domainsListFragment = new DomainsListFragment(); - supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); - supportFragmentManager.executePendingTransactions(); + fragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + fragmentManager.executePendingTransactions(); - // Display `addDomainFAB`. - addDomainFAB.setVisibility(View.VISIBLE); + // Show the add domain floating action button. + addDomainFAB.show(); // Hide `deleteMenuItem`. deleteMenuItem.setVisible(false); @@ -394,12 +410,16 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // 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, (View v) -> { // Do nothing because everything will be handled by `onDismissed()` below. }) .addCallback(new Snackbar.Callback() { + @SuppressLint("SwitchIntDef") // Ignore the lint warning about not handling the other possible events as they are covered by `default:`. @Override public void onDismissed(Snackbar snackbar, int event) { switch (event) { @@ -419,7 +439,7 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo Cursor undoDeleteDomainsCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomain(); // Setup `domainsCursorAdapter` with `this` context. `false` disables `autoRequery`. - CursorAdapter undoDeleteDomainsCursorAdapter = new CursorAdapter(context, undoDeleteDomainsCursor, false) { + CursorAdapter undoDeleteDomainsCursorAdapter = new CursorAdapter(getApplicationContext(), undoDeleteDomainsCursor, false) { @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { // Inflate the individual item layout. `false` does not attach it to the root. @@ -441,24 +461,23 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo domainsListView.setItemChecked(deletedDomainPosition, true); // Display `domainSettingsFragment`. - supportFragmentManager.beginTransaction().replace(R.id.domain_settings_fragment_container, domainSettingsFragment).commit(); + fragmentManager.beginTransaction().replace(R.id.domain_settings_fragment_container, domainSettingsFragment).commit(); // Enable the options `MenuItems`. deleteMenuItem.setEnabled(true); deleteMenuItem.setIcon(R.drawable.delete_light); } else { // The device in in one-paned mode. // Display `domainSettingsFragment`. - supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); + fragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); - // Hide `add_domain_fab`. - FloatingActionButton addDomainFAB = findViewById(R.id.add_domain_fab); - addDomainFAB.setVisibility(View.GONE); + // Hide the add domain floating action button. + addDomainFAB.hide(); // Show and enable `deleteMenuItem`. deleteMenuItem.setVisible(true); // Display `domainSettingsFragment`. - supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); + fragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); } break; @@ -467,7 +486,7 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Delete the selected domain. domainsDatabaseHelper.deleteDomain(databaseIdToDelete); - // enable `deleteMenuItem` if the system was waiting for a `Snackbar` to be dismissed. + // 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 = () -> { @@ -491,14 +510,23 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo 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; } @@ -515,11 +543,11 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo saveDomainSettings(coordinatorLayout, resources); // Store `DomainSettingsDisplayed`. - outState.putBoolean("domainSettingsDisplayed", true); - outState.putInt("domainSettingsDatabaseId", DomainSettingsFragment.databaseId); + outState.putBoolean("domain_settings_displayed", true); + outState.putInt("domain_settings_database_id", DomainSettingsFragment.databaseId); } else { // `DomainSettingsFragment` is not displayed. - outState.putBoolean("domainSettingsDisplayed", false); - outState.putInt("domainSettingsDatabaseId", -1); + outState.putBoolean("domain_settings_displayed", false); + outState.putInt("domain_settings_database_id", -1); } super.onSaveInstanceState(outState); @@ -528,6 +556,9 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Control what the navigation bar back button does. @Override public void onBackPressed() { + // Get a handle for the fragment manager. + FragmentManager fragmentManager = getSupportFragmentManager(); + 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) { @@ -535,15 +566,12 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo } // Dismiss the undo delete SnackBar if it is shown. - if (undoDeleteSnackbar != null && undoDeleteSnackbar.isShown()) { - undoDeleteSnackbar.dismiss(); - - // Create a runnable to return to the main activity. - Runnable navigateHomeRunnable = super::onBackPressed; + if ((undoDeleteSnackbar != null) && undoDeleteSnackbar.isShown()) { + // Set the close flag. + closeActivityAfterDismissingSnackbar = true; - // Navigate home after 300 milliseconds to make sure that the previous domain has been deleted from the database. - Handler handler = new Handler(); - handler.postDelayed(navigateHomeRunnable, 300); + // Dismiss the snackbar. + undoDeleteSnackbar.dismiss(); } else { // Pass `onBackPressed()` to the system. super.onBackPressed(); @@ -560,28 +588,25 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Display the domains list fragment. DomainsListFragment domainsListFragment = new DomainsListFragment(); - supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); - supportFragmentManager.executePendingTransactions(); + fragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + fragmentManager.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 the add domain FAB. - addDomainFAB.setVisibility(View.VISIBLE); + // Show the add domain floating action button. + addDomainFAB.show(); // Hide the delete menu item. deleteMenuItem.setVisible(false); } 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()) { - undoDeleteSnackbar.dismiss(); - - // Create a runnable to return to the main activity. - Runnable navigateHomeRunnable = super::onBackPressed; + if ((undoDeleteSnackbar != null) && undoDeleteSnackbar.isShown()) { + // Set the close flag. + closeActivityAfterDismissingSnackbar = true; - // Navigate home after 300 milliseconds to make sure that the previous domain has been deleted from the database. - Handler handler = new Handler(); - handler.postDelayed(navigateHomeRunnable, 300); + // Dismiss the snackbar. + undoDeleteSnackbar.dismiss(); } else { // Pass `onBackPressed()` to the system. super.onBackPressed(); @@ -590,9 +615,9 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo } @Override - public void onAddDomain(AppCompatDialogFragment dialogFragment) { + public void onAddDomain(DialogFragment dialogFragment) { // Dismiss the undo delete snackbar if it is currently displayed. - if ((undoDeleteSnackbar != null) && (undoDeleteSnackbar.isShown())) { + if ((undoDeleteSnackbar != null) && undoDeleteSnackbar.isShown()) { undoDeleteSnackbar.dismiss(); } @@ -607,46 +632,50 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo if (twoPanedMode) { // The device in in two-paned mode. populateDomainsListView(currentDomainDatabaseId); } else { // The device is in single-paned mode. - // Hide `add_domain_fab`. - addDomainFAB.setVisibility(View.GONE); + // Hide the add domain floating action button. + addDomainFAB.hide(); // Show and enable `deleteMenuItem`. DomainsActivity.deleteMenuItem.setVisible(true); - // Add `currentDomainDatabaseId` to `argumentsBundle`. + // Add the current domain database ID to the arguments bundle. Bundle argumentsBundle = new Bundle(); argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, currentDomainDatabaseId); - // Add `argumentsBundle` to `domainSettingsFragment`. + // Add and arguments bundle to the domain setting fragment. DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); domainSettingsFragment.setArguments(argumentsBundle); - // Display `domainSettingsFragment`. - supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); + // Display the domain settings fragment. + getSupportFragmentManager().beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); } } public void saveDomainSettings(View view, Resources resources) { // Get handles for the domain settings. 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); - 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); - 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); + Switch javaScriptSwitch = view.findViewById(R.id.javascript_switch); + Switch firstPartyCookiesSwitch = view.findViewById(R.id.first_party_cookies_switch); + Switch thirdPartyCookiesSwitch = view.findViewById(R.id.third_party_cookies_switch); + Switch domStorageSwitch = view.findViewById(R.id.dom_storage_switch); + Switch formDataSwitch = view.findViewById(R.id.form_data_switch); // Form data can be removed once the minimum API >= 26. + Switch easyListSwitch = view.findViewById(R.id.easylist_switch); + 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 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); + Spinner swipeToRefreshSpinner = view.findViewById(R.id.swipe_to_refresh_spinner); + Spinner displayWebpageImagesSpinner = view.findViewById(R.id.display_webpage_images_spinner); + Spinner nightModeSpinner = view.findViewById(R.id.night_mode_spinner); + Switch pinnedSslCertificateSwitch = view.findViewById(R.id.pinned_ssl_certificate_switch); RadioButton currentWebsiteCertificateRadioButton = view.findViewById(R.id.current_website_certificate_radiobutton); + Switch pinnedIpAddressesSwitch = view.findViewById(R.id.pinned_ip_addresses_switch); + RadioButton currentIpAddressesRadioButton = view.findViewById(R.id.current_ip_addresses_radiobutton); + TextView currentIpAddressesTextView = view.findViewById(R.id.current_ip_addresses_textview); // Extract the data for the domain settings. String domainNameString = domainNameEditText.getText().toString(); @@ -654,17 +683,20 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo boolean firstPartyCookiesEnabled = firstPartyCookiesSwitch.isChecked(); boolean thirdPartyCookiesEnabled = thirdPartyCookiesSwitch.isChecked(); boolean domStorageEnabled = domStorageSwitch.isChecked(); - boolean formDataEnabled = formDataSwitch.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(); + boolean pinnedIpAddress = pinnedIpAddressesSwitch.isChecked(); // Initialize the user agent name string. String userAgentName; @@ -693,36 +725,34 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo 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, javaScriptEnabled, firstPartyCookiesEnabled, thirdPartyCookiesEnabled, - domStorageEnabled, formDataEnabled, easyListEnabled, easyPrivacyEnabled, fanboysAnnoyanceEnabled, fanboysSocialBlockingEnabled, 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; + domainsDatabaseHelper.updateDomain(DomainsActivity.currentDomainDatabaseId, domainNameString, javaScriptEnabled, firstPartyCookiesEnabled, thirdPartyCookiesEnabled, + domStorageEnabled, formDataEnabled, easyListEnabled, easyPrivacyEnabled, fanboysAnnoyanceEnabled, fanboysSocialBlockingEnabled, ultraPrivacyEnabled, blockAllThirdPartyRequests, + userAgentName, fontSizeInt, swipeToRefreshInt, nightModeInt, displayWebpageImagesInt, pinnedSslCertificate, pinnedIpAddress); + // Update the pinned SSL certificate if a new one is checked. + if (currentWebsiteCertificateRadioButton.isChecked()) { // Store the values from the SSL certificate. - String issuedToCommonName = currentWebsiteSslCertificate.getIssuedTo().getCName(); - String issuedToOrganization = currentWebsiteSslCertificate.getIssuedTo().getOName(); - String issuedToOrganizationalUnit = currentWebsiteSslCertificate.getIssuedTo().getUName(); - String issuedByCommonName = currentWebsiteSslCertificate.getIssuedBy().getCName(); - String issuedByOrganization = currentWebsiteSslCertificate.getIssuedBy().getOName(); - String issuedByOrganizationalUnit = currentWebsiteSslCertificate.getIssuedBy().getUName(); - long startDateLong = currentWebsiteSslCertificate.getValidNotBeforeDate().getTime(); - long endDateLong = currentWebsiteSslCertificate.getValidNotAfterDate().getTime(); + String issuedToCommonName = currentSslCertificate.getIssuedTo().getCName(); + String issuedToOrganization = currentSslCertificate.getIssuedTo().getOName(); + String issuedToOrganizationalUnit = currentSslCertificate.getIssuedTo().getUName(); + String issuedByCommonName = currentSslCertificate.getIssuedBy().getCName(); + String issuedByOrganization = currentSslCertificate.getIssuedBy().getOName(); + String issuedByOrganizationalUnit = currentSslCertificate.getIssuedBy().getUName(); + long startDateLong = currentSslCertificate.getValidNotBeforeDate().getTime(); + long endDateLong = currentSslCertificate.getValidNotAfterDate().getTime(); // Update the database. - domainsDatabaseHelper.updateDomainWithCertificate(currentDomainDatabaseId, domainNameString, javaScriptEnabled, firstPartyCookiesEnabled, thirdPartyCookiesEnabled, domStorageEnabled, - formDataEnabled, easyListEnabled, easyPrivacyEnabled, fanboysAnnoyanceEnabled, fanboysSocialBlockingEnabled, 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, javaScriptEnabled, firstPartyCookiesEnabled, thirdPartyCookiesEnabled, domStorageEnabled, - formDataEnabled, easyListEnabled, easyPrivacyEnabled, fanboysAnnoyanceEnabled, fanboysSocialBlockingEnabled, userAgentName, fontSizeInt, swipeToRefreshInt, nightModeInt, - displayWebpageImagesInt,false); + domainsDatabaseHelper.updatePinnedSslCertificate(currentDomainDatabaseId, issuedToCommonName, issuedToOrganization, issuedToOrganizationalUnit, issuedByCommonName, issuedByOrganization, + issuedByOrganizationalUnit, startDateLong, endDateLong); + } + + // Update the pinned IP addresses if new ones are checked. + if (currentIpAddressesRadioButton.isChecked()) { + // Get the current IP addresses. + String currentIpAddresses = currentIpAddressesTextView.getText().toString(); + + // Update the database. + domainsDatabaseHelper.updatePinnedIpAddresses(currentDomainDatabaseId, currentIpAddresses); } } @@ -734,7 +764,7 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo Cursor domainsCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomain(); // Setup `domainsCursorAdapter` with `this` context. `false` disables `autoRequery`. - CursorAdapter domainsCursorAdapter = new CursorAdapter(context, domainsCursor, false) { + CursorAdapter domainsCursorAdapter = new CursorAdapter(getApplicationContext(), domainsCursor, false) { @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { // Inflate the individual item layout. `false` does not attach it to the root. @@ -775,22 +805,22 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Select the highlighted domain. domainsListView.setItemChecked(highlightedDomainPosition, true); - // Get the `databaseId` for the highlighted domain. + // Get the database ID for the highlighted domain. domainsCursor.moveToPosition(highlightedDomainPosition); currentDomainDatabaseId = domainsCursor.getInt(domainsCursor.getColumnIndex(DomainsDatabaseHelper._ID)); - // Store `databaseId` in `argumentsBundle`. + // Store the database ID in the arguments bundle. Bundle argumentsBundle = new Bundle(); argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, currentDomainDatabaseId); - // Add `argumentsBundle` to `domainSettingsFragment`. + // Add and arguments bundle to the domain settings fragment. DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); domainSettingsFragment.setArguments(argumentsBundle); - // Display `domainSettingsFragment`. - supportFragmentManager.beginTransaction().replace(R.id.domain_settings_fragment_container, domainSettingsFragment).commit(); + // Display the domain settings fragment. + getSupportFragmentManager().beginTransaction().replace(R.id.domain_settings_fragment_container, domainSettingsFragment).commit(); - // Enable the options `MenuItems`. + // Enable the delete options menu items. deleteMenuItem.setEnabled(true); // Set the delete icon according to the theme. @@ -805,4 +835,22 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo deleteMenuItem.setIcon(R.drawable.delete_blue); } } + + @Override + public void dismissSnackbar() { + // Dismiss the undo delete snackbar if it is shown. + if (undoDeleteSnackbar != null && undoDeleteSnackbar.isShown()) { + // Dismiss the snackbar. + undoDeleteSnackbar.dismiss(); + } + } + + @Override + public void onDestroy() { + // Close the domains database helper. + domainsDatabaseHelper.close(); + + // Run the default commands. + super.onDestroy(); + } } \ No newline at end of file