X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FDomainsActivity.java;h=59c5fb9ff6d4b30bcdabea988b905757c937c453;hb=8de7d02ce90569e36be421d89c44d3ef3f7378f6;hp=78fbfb53488c908a3ff23677ee51e26b77aeae32;hpb=b3b4105e9acd9cf8e202abef3b811d49c6c36bec;p=PrivacyBrowserAndroid.git 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 78fbfb53..59c5fb9f 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 Soren Stoutner . + * Copyright © 2017 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,10 +20,12 @@ package com.stoutner.privacybrowser.activities; import android.content.Context; -import android.content.Intent; import android.database.Cursor; 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; @@ -33,7 +35,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.AdapterView; import android.widget.CursorAdapter; import android.widget.EditText; import android.widget.ListView; @@ -44,99 +45,94 @@ import android.widget.TextView; 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 { - // `context` is used in `onCreate()` and `onOptionsItemSelected()`. - Context context; + // `twoPanedMode` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreate()` and `populateDomainsListView()`. + public static boolean twoPanedMode; - // `domainsDatabaseHelper` is used in `onCreate()`, `onOptionsItemSelected()`, `onAddDomain()`, and `updateDomainsRecyclerView()`. - private static DomainsDatabaseHelper domainsDatabaseHelper; + // `databaseId` is public static so it can be accessed from `DomainsListFragment`. It is also used in `saveDomainSettings()` and `populateDomainsListView()`. + public static int currentDomainDatabaseId; - // `domainsRecyclerView` is used in `onCreate()` and `updateDomainsListView()`. - private ListView domainsListView; + // `domainSettingsFragmentDisplayed` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreate()`, `onOptionsItemSelected()`, and `onBackPressed()`. + public static boolean domainSettingsFragmentDisplayed; + + // `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()`. + 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; - // `databaseId` is used in `onCreate()` and `onOptionsItemSelected()`. - private int databaseId; + // `context` is used in `onCreate()`, `onOptionsItemSelected()`, and `onAddDomain()`. + private Context context; - // `saveMenuItem` is used in `onCreate()`, `onOptionsItemSelected()`, and `onCreateOptionsMenu()`. - private MenuItem saveMenuItem; + // `supportFragmentManager` is used in `onCreate()`. + private FragmentManager supportFragmentManager; + + // `domainsDatabaseHelper` is used in `onCreate()` and `saveDomainSettings()`. + private static DomainsDatabaseHelper domainsDatabaseHelper; + + // `domainsListView` is used in `onCreate()` and `populateDomainsList()`. + private ListView domainsListView; - // `deleteMenuItem` is used in `onCreate()`, `onOptionsItemSelected()`, and `onCreateOptionsMenu()`. - private MenuItem deleteMenuItem; + // `addDomainFAB` is used in `onCreate()`, `onOptionsItemSelected()`, and `onBackPressed()`. + private FloatingActionButton addDomainFAB; @Override protected void onCreate(Bundle savedInstanceState) { + // Set the activity theme. + if (MainWebViewActivity.darkTheme) { + setTheme(R.style.PrivacyBrowserDark_SecondaryActivity); + } else { + setTheme(R.style.PrivacyBrowserLight_SecondaryActivity); + } + + // Run the default commands. super.onCreate(savedInstanceState); + + // Set the content view. setContentView(R.layout.domains_coordinatorlayout); // Get a handle for the context. 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 bookmarksAppBar = (Toolbar) findViewById(R.id.domains_toolbar); - setSupportActionBar(bookmarksAppBar); + final Toolbar domainsAppBar = (Toolbar) findViewById(R.id.domains_toolbar); + setSupportActionBar(domainsAppBar); // 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); - // Initialize the database handler. `this` specifies the context. 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(this, null, null, 0); + // 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); - // Determine if we are in two pane mode. `domains_settings_linearlayout` is only populated if two panes are present. - final boolean twoPaneMode = ((findViewById(R.id.domain_settings_scrollview)) != null); + // 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); - // Initialize `domainsListView`. - domainsListView = (ListView) findViewById(R.id.domains_listview); + // Display `DomainsListFragment`. + DomainsListFragment domainsListFragment = new DomainsListFragment(); + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + supportFragmentManager.executePendingTransactions(); - domainsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - // Convert the id from `long` to `int` to match the format of the domains database. - databaseId = (int) id; - - // Display the Domain Settings. - if (twoPaneMode) { // Display a fragment in two paned mode. - // Display the options `MenuItems`. - saveMenuItem.setVisible(true); - deleteMenuItem.setVisible(true); - - // Store `databaseId` in `argumentsBundle`. - Bundle argumentsBundle = new Bundle(); - argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, databaseId); - - // Add `argumentsBundle` to `domainSettingsFragment`. - DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); - domainSettingsFragment.setArguments(argumentsBundle); - - // Display `domainSettingsFragment`. - getSupportFragmentManager().beginTransaction().replace(R.id.domain_settings_scrollview, domainSettingsFragment).commit(); - } else { // Load the second activity on smaller screens. - // Create `domainSettingsActivityIntent` with the `databaseId`. - Intent domainSettingsActivityIntent = new Intent(context, DomainSettingsActivity.class); - domainSettingsActivityIntent.putExtra(DomainSettingsFragment.DATABASE_ID, databaseId); - - // Start `DomainSettingsActivity`. - context.startActivity(domainSettingsActivityIntent); - } - } - }); - - FloatingActionButton addDomainFAB = (FloatingActionButton) findViewById(R.id.add_domain_fab); + // 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(getSupportFragmentManager(), getResources().getString(R.string.add_domain)); + addDomainDialog.show(supportFragmentManager, getResources().getString(R.string.add_domain)); } }); - - // Load the `ListView`. - updateDomainsListView(); } @Override @@ -144,10 +140,15 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Inflate the menu. getMenuInflater().inflate(R.menu.domains_options_menu, menu); - // Store the `MenuItems` for future use. - saveMenuItem = menu.findItem(R.id.save_domain); + // Store `deleteMenuItem` for future use. deleteMenuItem = menu.findItem(R.id.delete_domain); + // Only display `deleteMenuItem` (initially) in two-paned mode. + deleteMenuItem.setVisible(twoPanedMode); + + // Populate the list of domains. We have to do this from `onCreateOptionsMenu()` instead of `onCreate()` because `populateDomainsListView()` needs the `deleteMenuItem` to be inflated. `-1` highlights the first domain. + populateDomainsListView(-1); + // Success! return true; } @@ -159,83 +160,344 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo switch (menuItemID) { case android.R.id.home: // The home arrow is identified as `android.R.id.home`, not just `R.id.home`. - // Go home. - NavUtils.navigateUpFromSameTask(this); - break; - - case R.id.save_domain: - // 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); - - // Extract the data for the domain settings. - String domainNameString = domainNameEditText.getText().toString(); - boolean javaScriptEnabled = javaScriptEnabledSwitch.isChecked(); - boolean firstPartyCookiesEnabled = firstPartyCookiesEnabledSwitch.isChecked(); - boolean thirdPartyCookiesEnabled = thirdPartyCookiesEnabledSwitch.isChecked(); - boolean domStorageEnabledEnabled = domStorageEnabledSwitch.isChecked(); - boolean formDataEnabled = formDataEnabledSwitch.isChecked(); - int userAgentPosition = userAgentSpinner.getSelectedItemPosition(); - int fontSizePosition = fontSizeSpinner.getSelectedItemPosition(); - - // Get the data for the `Spinners` from the entry values string arrays. - String userAgentString = getResources().getStringArray(R.array.user_agent_entry_values)[userAgentPosition]; - int fontSizeInt = Integer.parseInt(getResources().getStringArray(R.array.default_font_size_entry_values)[fontSizePosition]); - - // 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(); + 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(); + } + + // Go home. + NavUtils.navigateUpFromSameTask(this); + } else if (domainSettingsFragmentDisplayed) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed. + // Save the current domain settings. + saveDomainSettings(); + + // 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 if in two-paned mode. It has no effect in single-paned mode. + populateDomainsListView(-1); + + // Update `domainSettingsFragmentDisplayed`. + domainSettingsFragmentDisplayed = false; + + // Display `addDomainFAB`. + addDomainFAB.setVisibility(View.VISIBLE); + + // Hide `deleteMenuItem`. + deleteMenuItem.setVisible(false); + } else { // The device is in single-paned mode and `DomainsListFragment` is displayed. + // Go home. + NavUtils.navigateUpFromSameTask(this); } - - // Save the domain settings. - domainsDatabaseHelper.saveDomain(databaseId, domainNameString, javaScriptEnabled, firstPartyCookiesEnabled, thirdPartyCookiesEnabled, domStorageEnabledEnabled, formDataEnabled, userAgentString, fontSizeInt); break; case R.id.delete_domain: - // Delete the selected domain. - domainsDatabaseHelper.deleteDomain(databaseId); - - // Detach the domain settings fragment. - getSupportFragmentManager().beginTransaction().detach(getSupportFragmentManager().findFragmentById(R.id.domain_settings_scrollview)).commit(); + // Store a copy of `currentDomainDatabaseId` because it could change while the `Snackbar` is displayed. + final int databaseIdToDelete = currentDomainDatabaseId; + + // Store the deleted domain position, which is needed if `Undo` is selected in the `Snackbar`. + final int deletedDomainPosition = domainsListView.getCheckedItemPosition(); + + // Update the fragments and menu items. + if (twoPanedMode) { // Two-paned mode. + // Disable the options `MenuItems`. + deleteMenuItem.setEnabled(false); + deleteMenuItem.setIcon(R.drawable.delete_blue); + + // Remove the domain settings fragment. + supportFragmentManager.beginTransaction().remove(supportFragmentManager.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(); + + // Update `domainSettingsFragmentDisplayed`. + domainSettingsFragmentDisplayed = false; + + // Display `addDomainFAB`. + addDomainFAB.setVisibility(View.VISIBLE); + + // Hide `deleteMenuItem`. + deleteMenuItem.setVisible(false); + } - // Hide the options `MenuItems`. - saveMenuItem.setVisible(false); - deleteMenuItem.setVisible(false); + // Get a `Cursor` that does not show the domain to be deleted. + Cursor domainsPendingDeleteCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomainExcept(databaseIdToDelete); + + // Setup `domainsPendingDeleteCursorAdapter` with `this` context. `false` disables `autoRequery`. + CursorAdapter domainsPendingDeleteCursorAdapter = new CursorAdapter(this, domainsPendingDeleteCursor, false) { + @Override + public View newView(Context context, Cursor cursor, ViewGroup parent) { + // Inflate the individual item layout. `false` does not attach it to the root. + return getLayoutInflater().inflate(R.layout.domain_name_linearlayout, parent, false); + } + + @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); + domainNameTextView.setText(domainNameString); + } + }; + + // Update the handle for the current `domains_listview`. + domainsListView = (ListView) findViewById(R.id.domains_listview); // Update the `ListView`. - updateDomainsListView(); + domainsListView.setAdapter(domainsPendingDeleteCursorAdapter); + + // 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. + } + }) + .addCallback(new Snackbar.Callback() { + @Override + public void onDismissed(Snackbar snackbar, int event) { + switch (event) { + // The user pushed the `Undo` button. + case Snackbar.Callback.DISMISS_EVENT_ACTION: + // Store `databaseId` in `argumentsBundle`. + Bundle argumentsBundle = new Bundle(); + argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, databaseIdToDelete); + + // Add `argumentsBundle` to `domainSettingsFragment`. + DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); + domainSettingsFragment.setArguments(argumentsBundle); + + // Display the correct fragments. + if (twoPanedMode) { // The device in in two-paned mode. + // Get a `Cursor` with the current contents of the domains database. + Cursor undoDeleteDomainsCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomain(); + + // Setup `domainsCursorAdapter` with `this` context. `false` disables `autoRequery`. + CursorAdapter undoDeleteDomainsCursorAdapter = new CursorAdapter(context, 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. + return getLayoutInflater().inflate(R.layout.domain_name_linearlayout, parent, false); + } + + @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); + domainNameTextView.setText(domainNameString); + } + }; + + // Update the `ListView`. + domainsListView.setAdapter(undoDeleteDomainsCursorAdapter); + // Select the previously deleted domain in `domainsListView`. + domainsListView.setItemChecked(deletedDomainPosition, true); + + // Display `domainSettingsFragment`. + supportFragmentManager.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(); + + // Hide `add_domain_fab`. + FloatingActionButton addDomainFAB = (FloatingActionButton) findViewById(R.id.add_domain_fab); + addDomainFAB.setVisibility(View.GONE); + + // Show and enable `deleteMenuItem`. + deleteMenuItem.setVisible(true); + + // Set `domainSettingsFragmentDisplayed`. + domainSettingsFragmentDisplayed = true; + + // Display `domainSettingsFragment`. + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); + } + break; + + // The `Snackbar` was dismissed without the `Undo` button being pushed. + default: + // Delete the selected domain. + domainsDatabaseHelper.deleteDomain(databaseIdToDelete); + + // enable `deleteMenuItem` if the system was waiting for a `Snackbar` to be dismissed. + if (DomainsActivity.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); + } + + // Reset `dismissingSnackbar`. + dismissingSnackbar = false; + } + }; + + // Run `enableDeleteMenuItemRunnable` after 100 milliseconds to make sure that the previous domain has been deleted from the database. + Handler handler = new Handler(); + handler.postDelayed(enableDeleteMenuItemRunnable, 100); + } + break; + } + } + }); + undoDeleteSnackbar.show(); break; } + + // Consume the event. return true; } + // Control what the navigation bar back button does. + @Override + public void onBackPressed() { + 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(); + } + + // Go home. + NavUtils.navigateUpFromSameTask(this); + } else if (domainSettingsFragmentDisplayed) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed. + // Save the current domain settings. + saveDomainSettings(); + + // 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 if in two-paned mode. It has no effect in single-paned mode. + populateDomainsListView(-1); + + // Update `domainSettingsFragmentDisplayed`. + domainSettingsFragmentDisplayed = false; + + // Display `addDomainFAB`. + addDomainFAB.setVisibility(View.VISIBLE); + + // Hide `deleteMenuItem`. + deleteMenuItem.setVisible(false); + } else { // The device is in single-paned mode and `DomainsListFragment` is displayed. + // 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())) { + undoDeleteSnackbar.dismiss(); + } + // Get the `domainNameEditText` from `dialogFragment` and extract the string. EditText domainNameEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.domain_name_edittext); String domainNameString = domainNameEditText.getText().toString(); - // Create the domain. - domainsDatabaseHelper.addDomain(domainNameString); + // Create the domain and store the database ID in `currentDomainDatabaseId`. + currentDomainDatabaseId = domainsDatabaseHelper.addDomain(domainNameString); + + // Display the newly created domain. + 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); + + // Show and enable `deleteMenuItem`. + DomainsActivity.deleteMenuItem.setVisible(true); + + // Set `domainSettingsFragmentDisplayed`. + DomainsActivity.domainSettingsFragmentDisplayed = true; + + // Add `currentDomainDatabaseId` to `argumentsBundle`. + Bundle argumentsBundle = new Bundle(); + argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, currentDomainDatabaseId); + + // Add `argumentsBundle` to `domainSettingsFragment`. + DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); + domainSettingsFragment.setArguments(argumentsBundle); + + // Display `domainSettingsFragment`. + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); + } + } + + private void saveDomainSettings() { + // 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); + + // 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(); + int displayWebpageImagesInt = displayWebpageImagesSpinner.getSelectedItemPosition(); + + // 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]); + + // 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(); + } - // Refresh the `ListView`. - updateDomainsListView(); + // Save the domain settings. + domainsDatabaseHelper.saveDomain(currentDomainDatabaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean, formDataEnabledBoolean, userAgentString, fontSizeInt, + displayWebpageImagesInt); } - private void updateDomainsListView() { + private void populateDomainsListView(final int highlightedDomainDatabaseId) { + // get a handle for the current `domains_listview`. + domainsListView = (ListView) findViewById(R.id.domains_listview); + // Get a `Cursor` with the current contents of the domains database. - Cursor domainsCursor = domainsDatabaseHelper.getCursorOrderedByDomain(); + Cursor domainsCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomain(); // Setup `domainsCursorAdapter` with `this` context. `false` disables `autoRequery`. - CursorAdapter domainsCursorAdapter = new CursorAdapter(this, domainsCursor, false) { + CursorAdapter domainsCursorAdapter = new CursorAdapter(context, 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. @@ -251,7 +513,59 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo } }; - // Update the `RecyclerView`. + // Update the `ListView`. 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. + if (DomainsActivity.twoPanedMode && (domainsCursor.getCount() > 0)) { // Two-paned mode is enabled and there is at least one domain. + // Initialize `highlightedDomainPosition`. + int highlightedDomainPosition = 0; + + // Get the cursor position for the highlighted domain. + for (int i = 0; i < domainsCursor.getCount(); i++) { + // Move to position `i` in the cursor. + domainsCursor.moveToPosition(i); + + // Get the database ID for this position. + int currentDatabaseId = domainsCursor.getInt(domainsCursor.getColumnIndex(DomainsDatabaseHelper._ID)); + + // Set `highlightedDomainPosition` if the database ID for this matches `highlightedDomainDatabaseId`. + if (highlightedDomainDatabaseId == currentDatabaseId) { + highlightedDomainPosition = i; + } + } + + // Select the highlighted domain. + domainsListView.setItemChecked(highlightedDomainPosition, true); + + // Get the `databaseId` for the highlighted domain. + domainsCursor.moveToPosition(highlightedDomainPosition); + currentDomainDatabaseId = domainsCursor.getInt(domainsCursor.getColumnIndex(DomainsDatabaseHelper._ID)); + + // Store `databaseId` in `argumentsBundle`. + Bundle argumentsBundle = new Bundle(); + argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, currentDomainDatabaseId); + + // Add `argumentsBundle` to `domainSettingsFragment`. + DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); + domainSettingsFragment.setArguments(argumentsBundle); + + // Display `domainSettingsFragment`. + supportFragmentManager.beginTransaction().replace(R.id.domain_settings_fragment_container, domainSettingsFragment).commit(); + + // Enable the options `MenuItems`. + 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 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); + } } } \ No newline at end of file