X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FDomainsActivity.java;h=2a2b92dbb1d1de13064ccdfefc7c756bffa88609;hb=5545ec452e70a3b8a99ff7b4bef330c1333d1a60;hp=323cd83361c3c57d441a79e95bae26c8d6653b3f;hpb=3d3841e7993bc877b7143f259a9d2115f6a19b3f;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 323cd833..2a2b92db 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java @@ -22,6 +22,7 @@ package com.stoutner.privacybrowser.activities; import android.content.Context; 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; @@ -48,22 +49,25 @@ import com.stoutner.privacybrowser.fragments.DomainsListFragment; import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper; 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()` and `populateDomainsListView()`. + // `twoPanedMode` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreate()`, `onCreateOptionsMenu()`, and `populateDomainsListView()`. public static boolean twoPanedMode; - // `databaseId` is public static so it can be accessed from `DomainsListFragment`. It is also used in `saveDomainSettings()` and `populateDomainsListView()`. + // `databaseId` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreateOptionsMenu()`, `saveDomainSettings()` and `populateDomainsListView()`. public static int currentDomainDatabaseId; - // `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; + // `context` is used in `onCreate()`, `onOptionsItemSelected()`, and `onAddDomain()`. private Context context; - // `supportFragmentManager` is used in `onCreate()`. + // `supportFragmentManager` is used in `onCreate()` and `onCreateOptionsMenu()`. private FragmentManager supportFragmentManager; // `domainsDatabaseHelper` is used in `onCreate()` and `saveDomainSettings()`. @@ -72,9 +76,21 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // `domainsListView` is used in `onCreate()` and `populateDomainsList()`. private ListView domainsListView; - // `addDomainFAB` is used in `onCreate()`, `onOptionsItemSelected()`, and `onBackPressed()`. + // `addDomainFAB` is used in `onCreate()`, `onCreateOptionsMenu()`, `onOptionsItemSelected()`, and `onBackPressed()`. private FloatingActionButton addDomainFAB; + // `deletedDomainPosition` is used in an inner and outer class in `onOptionsItemSelected()`. + private int deletedDomainPosition; + + // `restartAfterRotate` is used in `onCreate()` and `onCreateOptionsMenu()`. + private boolean restartAfterRotate; + + // `domainSettingsDisplayedBeforeRotate` is used in `onCreate()` and `onCreateOptionsMenu()`. + private boolean domainSettingsDisplayedBeforeRotate; + + // `domainSettingsDatabaseIdBeforeRotate` is used in `onCreate()` and `onCreateOptionsMenu()`. + private int domainSettingsDatabaseIdBeforeRotate; + @Override protected void onCreate(Bundle savedInstanceState) { // Set the activity theme. @@ -87,6 +103,13 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Run the default commands. super.onCreate(savedInstanceState); + // Extract the values from `savedInstanceState` if it is not `null`. + if (savedInstanceState != null) { + restartAfterRotate = true; + domainSettingsDisplayedBeforeRotate = savedInstanceState.getBoolean("domainSettingsDisplayed"); + domainSettingsDatabaseIdBeforeRotate = savedInstanceState.getInt("domainSettingsDatabaseId"); + } + // Set the content view. setContentView(R.layout.domains_coordinatorlayout); @@ -111,11 +134,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // 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); - // Display `DomainsListFragment`. - DomainsListFragment domainsListFragment = new DomainsListFragment(); - supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); - supportFragmentManager.executePendingTransactions(); - // Configure `addDomainFAB`. addDomainFAB = (FloatingActionButton) findViewById(R.id.add_domain_fab); addDomainFAB.setOnClickListener(new View.OnClickListener() { @@ -139,8 +157,50 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // 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); + // 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; + + // Store `currentDomainDatabaseId`. + currentDomainDatabaseId = domainSettingsDatabaseIdBeforeRotate; + + // 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); + + // 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 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; + + // 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(domainSettingsDatabaseIdBeforeRotate); + } 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(); + + // Populate the list of domains. `-1` highlights the first domain. + populateDomainsListView(-1); + } // Success! return true; @@ -154,14 +214,14 @@ 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`. if (twoPanedMode) { // The device is in two-paned mode. - // If there is at least one domain, save the current domain settings. - if (domainsListView.getCount() > 0) { + // 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. + } else if (findViewById(R.id.domain_settings_scrollview) != null) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed. // Save the current domain settings. saveDomainSettings(); @@ -173,9 +233,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // 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); @@ -191,11 +248,11 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // 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. + // Store the deleted domain position, which is needed if `Undo` is selected in the `Snackbar`. + deletedDomainPosition = domainsListView.getCheckedItemPosition(); + // Disable the options `MenuItems`. deleteMenuItem.setEnabled(false); deleteMenuItem.setIcon(R.drawable.delete_blue); @@ -208,9 +265,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); supportFragmentManager.executePendingTransactions(); - // Update `domainSettingsFragmentDisplayed`. - domainSettingsFragmentDisplayed = false; - // Display `addDomainFAB`. addDomainFAB.setVisibility(View.VISIBLE); @@ -245,7 +299,7 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo domainsListView.setAdapter(domainsPendingDeleteCursorAdapter); // Display a `Snackbar`. - Snackbar.make(domainsListView, R.string.domain_deleted, Snackbar.LENGTH_LONG) + undoDeleteSnackbar = Snackbar.make(domainsListView, R.string.domain_deleted, Snackbar.LENGTH_LONG) .setAction(R.string.undo, new View.OnClickListener() { @Override public void onClick(View v) { @@ -310,9 +364,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Show and enable `deleteMenuItem`. deleteMenuItem.setVisible(true); - // Set `domainSettingsFragmentDisplayed`. - domainSettingsFragmentDisplayed = true; - // Display `domainSettingsFragment`. supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); } @@ -322,11 +373,43 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo 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; } } - }) - .show(); + }); + undoDeleteSnackbar.show(); break; } @@ -334,18 +417,33 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo return true; } + @Override + protected void onSaveInstanceState(Bundle outState) { + // Store the current `DomainSettingsFragment` state in `outState`. + if (findViewById(R.id.domain_settings_scrollview) != null) { // `DomainSettingsFragment` is displayed. + // Store `DomainSettingsDisplayed`. + outState.putBoolean("domainSettingsDisplayed", true); + outState.putInt("domainSettingsDatabaseId", DomainSettingsFragment.databaseId); + } else { // `DomainSettingsFragment` is not displayed. + outState.putBoolean("domainSettingsDisplayed", false); + outState.putInt("domainSettingsDatabaseId", -1); + } + + super.onSaveInstanceState(outState); + } + // Control what the navigation bar back button does. @Override public void onBackPressed() { if (twoPanedMode) { // The device is in two-paned mode. - // If there is at least one domain, save the current domain settings. - if (domainsListView.getCount() > 0) { + // 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. + } else if (findViewById(R.id.domain_settings_scrollview) != null) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed. // Save the current domain settings. saveDomainSettings(); @@ -357,9 +455,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // 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); @@ -373,6 +468,11 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo @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(); @@ -390,9 +490,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // 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);