]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/blobdiff - app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java
Combine drawable files. https://redmine.stoutner.com/issues/794
[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / activities / BookmarksDatabaseViewActivity.java
index 53fb657d4cebe31d25cf67027635ebe4a7e9a132..91afa6d64120a2d15d1bbba2b53083b4e7ae22bc 100644 (file)
 /*
- * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.stoutner.privacybrowser.activities;
 
+import android.annotation.SuppressLint;
+import android.app.Dialog;
 import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.database.MergeCursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Typeface;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.CursorAdapter;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import android.preference.PreferenceManager;
+import android.util.SparseBooleanArray;
+import android.view.ActionMode;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.AbsListView;
+import android.widget.AdapterView;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.RadioButton;
+import android.widget.ResourceCursorAdapter;
+import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;  // The AndroidX toolbar must be used until the minimum API is >= 21.
+import androidx.core.content.ContextCompat;
+import androidx.cursoradapter.widget.CursorAdapter;
+import androidx.fragment.app.DialogFragment;  // The AndroidX dialog fragment must be used or an error is produced on API <=22.
+
+import com.google.android.material.snackbar.Snackbar;
+
 import com.stoutner.privacybrowser.R;
+import com.stoutner.privacybrowser.dialogs.EditBookmarkDatabaseViewDialog;
+import com.stoutner.privacybrowser.dialogs.EditBookmarkFolderDatabaseViewDialog;
 import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper;
 
-public class BookmarksDatabaseViewActivity extends AppCompatActivity {
-    // `bookmarksDatabaseHelper` is used in `onCreate()` and `updateBookmarksListView()`.
-    private BookmarksDatabaseHelper bookmarksDatabaseHelper;
+import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
+
+public class BookmarksDatabaseViewActivity extends AppCompatActivity implements EditBookmarkDatabaseViewDialog.EditBookmarkDatabaseViewListener,
+        EditBookmarkFolderDatabaseViewDialog.EditBookmarkFolderDatabaseViewListener {
+    // Define the class constants.
+    private static final int ALL_FOLDERS_DATABASE_ID = -2;
+    public static final int HOME_FOLDER_DATABASE_ID = -1;
 
-    // `bookmarksListView` is used in `onCreate()` and `updateBookmarksListView()`.
-    private ListView bookmarksListView;
+    // Define the saved instance state constants.
+    private final String CURRENT_FOLDER_DATABASE_ID = "current_folder_database_id";
+    private final String CURRENT_FOLDER_NAME = "current_folder_name";
+    private final String SORT_BY_DISPLAY_ORDER = "sort_by_display_order";
+
+    // Define the class variables.
+    private int currentFolderDatabaseId;
+    private String currentFolderName;
+    private boolean sortByDisplayOrder;
+    private BookmarksDatabaseHelper bookmarksDatabaseHelper;
+    private Cursor bookmarksCursor;
+    private CursorAdapter bookmarksCursorAdapter;
+    private String oldFolderNameString;
+    private Snackbar bookmarksDeletedSnackbar;
+    private boolean closeActivityAfterDismissingSnackbar;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        // Get a handle for the shared preferences.
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+        // Get the preferences.
+        boolean allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false);
+        boolean bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false);
+
+        // Disable screenshots if not allowed.
+        if (!allowScreenshots) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        }
+
         // Set the activity theme.
-        if (MainWebViewActivity.darkTheme) {
-            setTheme(R.style.PrivacyBrowserDark_SecondaryActivity);
+        setTheme(R.style.PrivacyBrowser);
+
+        // Run the default commands.
+        super.onCreate(savedInstanceState);
+
+        // Get the intent that launched the activity.
+        Intent launchingIntent = getIntent();
+
+        // Get the favorite icon byte array.
+        byte[] favoriteIconByteArray = launchingIntent.getByteArrayExtra("favorite_icon_byte_array");
+
+        // Remove the incorrect lint warning below that the favorite icon byte array might be null.
+        assert favoriteIconByteArray != null;
+
+        // Convert the favorite icon byte array to a bitmap and store it in a class variable.
+        Bitmap favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.length);
+
+        // Set the view according to the theme.
+        if (bottomAppBar) {
+            // Set the content view.
+            setContentView(R.layout.bookmarks_databaseview_bottom_appbar);
         } else {
-            setTheme(R.style.PrivacyBrowserLight_SecondaryActivity);
+            // `Window.FEATURE_ACTION_MODE_OVERLAY` makes the contextual action mode cover the support action bar.  It must be requested before the content is set.
+            supportRequestWindowFeature(Window.FEATURE_ACTION_MODE_OVERLAY);
+
+            // Set the content view.
+            setContentView(R.layout.bookmarks_databaseview_top_appbar);
         }
 
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.bookmarks_database_view_coordinatorlayout);
+        // Get a handle for the toolbar.
+        Toolbar toolbar = findViewById(R.id.bookmarks_databaseview_toolbar);
+
+        // Set the support action bar.
+        setSupportActionBar(toolbar);
 
-        // We need to use the `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21.
-        final Toolbar bookmarksDatabaseViewAppBar = (Toolbar) findViewById(R.id.bookmarks_database_view_toolbar);
-        setSupportActionBar(bookmarksDatabaseViewAppBar);
+        // Get a handle for the action bar.
+        ActionBar actionBar = getSupportActionBar();
 
-        // Display the home arrow on `SupportActionBar`.
-        final 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);
+        // Remove the incorrect lint warning that the action bar might be null.
+        assert actionBar != null;
 
-        // Initialize the database handler and the ListView.
-        // `this` specifies the context.  The two `null`s do not specify the database name or a `CursorFactory`.
-        // The `0` is to specify a database version, but that is set instead using a constant in `BookmarksDatabaseHelper`.
+        // Display the spinner and the back arrow in the action bar.
+        actionBar.setCustomView(R.layout.spinner);
+        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM | ActionBar.DISPLAY_HOME_AS_UP);
+
+        // Initialize the database handler.  The `0` is to specify a database version, but that is set instead using a constant in `BookmarksDatabaseHelper`.
         bookmarksDatabaseHelper = new BookmarksDatabaseHelper(this, null, null, 0);
-        bookmarksListView = (ListView) findViewById(R.id.bookmarks_database_view_listview);
 
-        // Display the bookmarks in the ListView.
-        updateBookmarksListView();
+        // Setup a matrix cursor for "All Folders" and "Home Folder".
+        String[] matrixCursorColumnNames = {BookmarksDatabaseHelper._ID, BookmarksDatabaseHelper.BOOKMARK_NAME};
+        MatrixCursor matrixCursor = new MatrixCursor(matrixCursorColumnNames);
+        matrixCursor.addRow(new Object[]{ALL_FOLDERS_DATABASE_ID, getString(R.string.all_folders)});
+        matrixCursor.addRow(new Object[]{HOME_FOLDER_DATABASE_ID, getString(R.string.home_folder)});
 
-    }
+        // Get a cursor with the list of all the folders.
+        Cursor foldersCursor = bookmarksDatabaseHelper.getAllFolders();
 
-    private void updateBookmarksListView() {
-        // Get a `Cursor` with the current contents of the bookmarks database.
-        final Cursor bookmarksCursor = bookmarksDatabaseHelper.getAllBookmarksCursor();
+        // Combine the matrix cursor and the folders cursor.
+        MergeCursor foldersMergeCursor = new MergeCursor(new Cursor[]{matrixCursor, foldersCursor});
+
+
+        // Get the default folder bitmap.  `ContextCompat` must be used until the minimum API >= 21.
+        Drawable defaultFolderDrawable = ContextCompat.getDrawable(getApplicationContext(), R.drawable.folder_blue_bitmap);
+
+        // Cast the default folder drawable to a bitmap drawable.
+        BitmapDrawable defaultFolderBitmapDrawable = (BitmapDrawable) defaultFolderDrawable;
+
+        // Remove the incorrect lint warning that `.getBitmap()` might be null.
+        assert defaultFolderBitmapDrawable != null;
+
+        // Convert the default folder bitmap drawable to a bitmap.
+        Bitmap defaultFolderBitmap = defaultFolderBitmapDrawable.getBitmap();
+
+
+        // Create a resource cursor adapter for the spinner.
+        ResourceCursorAdapter foldersCursorAdapter = new ResourceCursorAdapter(this, R.layout.appbar_spinner_item, foldersMergeCursor, 0) {
+            @Override
+            public void bindView(View view, Context context, Cursor cursor) {
+                // Get handles for the spinner views.
+                ImageView spinnerItemImageView = view.findViewById(R.id.spinner_item_imageview);
+                TextView spinnerItemTextView = view.findViewById(R.id.spinner_item_textview);
+
+                // Set the folder icon according to the type.
+                if (foldersMergeCursor.getPosition() > 1) {  // Set a user folder icon.
+                    // Initialize a default folder icon byte array output stream.
+                    ByteArrayOutputStream defaultFolderIconByteArrayOutputStream = new ByteArrayOutputStream();
+
+                    // Covert the default folder bitmap to a PNG and store it in the output stream.  `0` is for lossless compression (the only option for a PNG).
+                    defaultFolderBitmap.compress(Bitmap.CompressFormat.PNG, 0, defaultFolderIconByteArrayOutputStream);
+
+                    // Convert the default folder icon output stream to a byte array.
+                    byte[] defaultFolderIconByteArray = defaultFolderIconByteArrayOutputStream.toByteArray();
+
+
+                    // Get the folder icon byte array from the cursor.
+                    byte[] folderIconByteArray = cursor.getBlob(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.FAVORITE_ICON));
+
+                    // Convert the byte array to a bitmap beginning at the first byte and ending at the last.
+                    Bitmap folderIconBitmap = BitmapFactory.decodeByteArray(folderIconByteArray, 0, folderIconByteArray.length);
+
+
+                    // Set the icon according to the type.
+                    if (Arrays.equals(folderIconByteArray, defaultFolderIconByteArray)) {  // The default folder icon is used.
+                        // Set a smaller and darker folder icon, which works well with the spinner.
+                        spinnerItemImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.folder_dark_blue));
+                    } else {  // A custom folder icon is uses.
+                        // Set the folder image stored in the cursor.
+                        spinnerItemImageView.setImageBitmap(folderIconBitmap);
+                    }
+                } else {  // Set the `All Folders` or `Home Folder` icon.
+                    // Set the gray folder image.  `ContextCompat` must be used until the minimum API >= 21.
+                    spinnerItemImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.folder_gray));
+                }
+
+                // Set the text view to display the folder name.
+                spinnerItemTextView.setText(cursor.getString(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME)));
+            }
+        };
+
+        // Set the resource cursor adapter drop drown view resource.
+        foldersCursorAdapter.setDropDownViewResource(R.layout.appbar_spinner_dropdown_item);
+
+        // Get a handle for the folder spinner and set the adapter.
+        Spinner folderSpinner = findViewById(R.id.spinner);
+        folderSpinner.setAdapter(foldersCursorAdapter);
+
+        // Wait to set the on item selected listener until the spinner has been inflated.  Otherwise the activity will crash on restart.
+        folderSpinner.post(() -> {
+            // Handle taps on the spinner dropdown.
+            folderSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                    // Store the current folder database ID.
+                    currentFolderDatabaseId = (int) id;
+
+                    // Get a handle for the selected view.
+                    TextView selectedFolderTextView = findViewById(R.id.spinner_item_textview);
+
+                    // Store the current folder name.
+                    currentFolderName = selectedFolderTextView.getText().toString();
+
+                    // Update the list view.
+                    updateBookmarksListView();
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> parent) {
+                    // Do nothing.
+                }
+            });
+        });
+
+
+        // Get a handle for the bookmarks listview.
+        ListView bookmarksListView = findViewById(R.id.bookmarks_databaseview_listview);
+
+        // Check to see if the activity was restarted.
+        if (savedInstanceState == null) {  // The activity was not restarted.
+            // Set the default current folder database ID.
+            currentFolderDatabaseId = ALL_FOLDERS_DATABASE_ID;
+        } else {  // The activity was restarted.
+            // Restore the class variables from the saved instance state.
+            currentFolderDatabaseId = savedInstanceState.getInt(CURRENT_FOLDER_DATABASE_ID);
+            currentFolderName = savedInstanceState.getString(CURRENT_FOLDER_NAME);
+            sortByDisplayOrder = savedInstanceState.getBoolean(SORT_BY_DISPLAY_ORDER);
+
+            // Update the spinner if the home folder is selected.  Android handles this by default for the main cursor but not the matrix cursor.
+            if (currentFolderDatabaseId == HOME_FOLDER_DATABASE_ID) {
+                folderSpinner.setSelection(1);
+            }
+        }
+
+        // Update the bookmarks listview.
+        updateBookmarksListView();
 
-        // Setup `bookmarksCursorAdapter` with `this` context.  The `false` disables autoRequery.
-        CursorAdapter bookmarksCursorAdapter = new CursorAdapter(this, bookmarksCursor, false) {
+        // Setup a `CursorAdapter` with `this` context.  `false` disables autoRequery.
+        bookmarksCursorAdapter = new CursorAdapter(this, bookmarksCursor, 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.bookmarks_database_view_item_linearlayout, parent, false);
+                return getLayoutInflater().inflate(R.layout.bookmarks_databaseview_item_linearlayout, parent, false);
             }
 
             @Override
             public void bindView(View view, Context context, Cursor cursor) {
-                boolean isFolder = (cursor.getInt(cursor.getColumnIndex(BookmarksDatabaseHelper.IS_FOLDER)) == 1);
+                boolean isFolder = (cursor.getInt(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.IS_FOLDER)) == 1);
 
                 // Get the database ID from the `Cursor` and display it in `bookmarkDatabaseIdTextView`.
-                int bookmarkDatabaseId = cursor.getInt(cursor.getColumnIndex(BookmarksDatabaseHelper._ID));
-                TextView bookmarkDatabaseIdTextView = (TextView) view.findViewById(R.id.bookmarks_database_view_database_id);
+                int bookmarkDatabaseId = cursor.getInt(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper._ID));
+                TextView bookmarkDatabaseIdTextView = view.findViewById(R.id.bookmarks_databaseview_database_id);
                 bookmarkDatabaseIdTextView.setText(String.valueOf(bookmarkDatabaseId));
 
                 // Get the favorite icon byte array from the `Cursor`.
-                byte[] favoriteIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON));
+                byte[] favoriteIconByteArray = cursor.getBlob(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.FAVORITE_ICON));
                 // Convert the byte array to a `Bitmap` beginning at the beginning at the first byte and ending at the last.
                 Bitmap favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.length);
                 // Display the bitmap in `bookmarkFavoriteIcon`.
-                ImageView bookmarkFavoriteIcon = (ImageView) view.findViewById(R.id.bookmarks_database_view_favorite_icon);
+                ImageView bookmarkFavoriteIcon = view.findViewById(R.id.bookmarks_databaseview_favorite_icon);
                 bookmarkFavoriteIcon.setImageBitmap(favoriteIconBitmap);
 
                 // Get the bookmark name from the `Cursor` and display it in `bookmarkNameTextView`.
-                String bookmarkNameString = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME));
-                TextView bookmarkNameTextView = (TextView) view.findViewById(R.id.bookmarks_database_view_bookmark_name);
+                String bookmarkNameString = cursor.getString(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME));
+                TextView bookmarkNameTextView = view.findViewById(R.id.bookmarks_databaseview_bookmark_name);
                 bookmarkNameTextView.setText(bookmarkNameString);
+
                 // Make the font bold for folders.
                 if (isFolder) {
-                    // The first argument is `null` because we don't want to change the font.
+                    // The first argument is `null` prevent changing of the font.
                     bookmarkNameTextView.setTypeface(null, Typeface.BOLD);
                 } else {  // Reset the font to default.
                     bookmarkNameTextView.setTypeface(Typeface.DEFAULT);
                 }
 
+                // Get the bookmark URL form the `Cursor` and display it in `bookmarkUrlTextView`.
+                String bookmarkUrlString = cursor.getString(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_URL));
+                TextView bookmarkUrlTextView = view.findViewById(R.id.bookmarks_databaseview_bookmark_url);
+                bookmarkUrlTextView.setText(bookmarkUrlString);
+
+                // Hide the URL if the bookmark is a folder.
+                if (isFolder) {
+                    bookmarkUrlTextView.setVisibility(View.GONE);
+                } else {
+                    bookmarkUrlTextView.setVisibility(View.VISIBLE);
+                }
+
                 // Get the display order from the `Cursor` and display it in `bookmarkDisplayOrderTextView`.
-                int bookmarkDisplayOrder = cursor.getInt(cursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER));
-                TextView bookmarkDisplayOrderTextView = (TextView) view.findViewById(R.id.bookmarks_database_view_display_order);
+                int bookmarkDisplayOrder = cursor.getInt(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.DISPLAY_ORDER));
+                TextView bookmarkDisplayOrderTextView = view.findViewById(R.id.bookmarks_databaseview_display_order);
                 bookmarkDisplayOrderTextView.setText(String.valueOf(bookmarkDisplayOrder));
 
                 // Get the parent folder from the `Cursor` and display it in `bookmarkParentFolder`.
-                String bookmarkParentFolder = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER));
-                ImageView parentFolderImageView = (ImageView) view.findViewById(R.id.bookmarks_database_view_parent_folder_icon);
-                TextView bookmarkParentFolderTextView = (TextView) view.findViewById(R.id.bookmarks_database_view_parent_folder);
+                String bookmarkParentFolder = cursor.getString(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.PARENT_FOLDER));
+                ImageView parentFolderImageView = view.findViewById(R.id.bookmarks_databaseview_parent_folder_icon);
+                TextView bookmarkParentFolderTextView = view.findViewById(R.id.bookmarks_databaseview_parent_folder);
+
                 // Make the folder name gray if it is the home folder.
                 if (bookmarkParentFolder.isEmpty()) {
                     parentFolderImageView.setImageDrawable(ContextCompat.getDrawable(getApplicationContext(), R.drawable.folder_gray));
@@ -137,27 +352,570 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity {
                     parentFolderImageView.setImageDrawable(ContextCompat.getDrawable(getApplicationContext(), R.drawable.folder_dark_blue));
                     bookmarkParentFolderTextView.setText(bookmarkParentFolder);
 
+                    // Get the current theme status.
+                    int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+
                     // Set the text color according to the theme.
-                    if (MainWebViewActivity.darkTheme) {
+                    if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                        // This color is a little darker than the default night mode text.  But the effect is rather nice.
                         bookmarkParentFolderTextView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.gray_300));
                     } else {
                         bookmarkParentFolderTextView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.black));
                     }
                 }
-
-                // Get the bookmark URL form the `Cursor` and display it in `bookmarkUrlTextView`.
-                String bookmarkUrlString = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL));
-                TextView bookmarkUrlTextView = (TextView) view.findViewById(R.id.bookmarks_database_view_bookmark_url);
-                bookmarkUrlTextView.setText(bookmarkUrlString);
-                if (isFolder) {
-                    bookmarkUrlTextView.setVisibility(View.GONE);
-                } else {
-                    bookmarkUrlTextView.setVisibility(View.VISIBLE);
-                }
             }
         };
 
         // Update the ListView.
         bookmarksListView.setAdapter(bookmarksCursorAdapter);
+
+        // Set a listener to edit a bookmark when it is tapped.
+        bookmarksListView.setOnItemClickListener((AdapterView<?> parent, View view, int position, long id) -> {
+            // Convert the database ID to an int.
+            int databaseId = (int) id;
+
+            // Show the edit bookmark or edit bookmark folder dialog.
+            if (bookmarksDatabaseHelper.isFolder(databaseId)) {
+                // Save the current folder name, which is used in `onSaveBookmarkFolder()`.
+                oldFolderNameString = bookmarksCursor.getString(bookmarksCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME));
+
+                // Show the edit bookmark folder dialog.
+                DialogFragment editBookmarkFolderDatabaseViewDialog = EditBookmarkFolderDatabaseViewDialog.folderDatabaseId(databaseId, favoriteIconBitmap);
+                editBookmarkFolderDatabaseViewDialog.show(getSupportFragmentManager(), getResources().getString(R.string.edit_folder));
+            } else {
+                // Show the edit bookmark dialog.
+                DialogFragment editBookmarkDatabaseViewDialog = EditBookmarkDatabaseViewDialog.bookmarkDatabaseId(databaseId, favoriteIconBitmap);
+                editBookmarkDatabaseViewDialog.show(getSupportFragmentManager(), getResources().getString(R.string.edit_bookmark));
+            }
+        });
+
+        // Handle long presses on the list view.
+        bookmarksListView.setMultiChoiceModeListener(new AbsListView.MultiChoiceModeListener() {
+            // Instantiate the common variables.
+            MenuItem selectAllMenuItem;
+            MenuItem deleteMenuItem;
+            boolean deletingBookmarks;
+
+            @Override
+            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                // Inflate the menu for the contextual app bar.
+                getMenuInflater().inflate(R.menu.bookmarks_databaseview_context_menu, menu);
+
+                // Set the title.
+                mode.setTitle(R.string.bookmarks);
+
+                // Get handles for the menu items.
+                selectAllMenuItem = menu.findItem(R.id.select_all);
+                deleteMenuItem = menu.findItem(R.id.delete);
+
+                // Disable the delete menu item if a delete is pending.
+                deleteMenuItem.setEnabled(!deletingBookmarks);
+
+                // Get the number of currently selected bookmarks.
+                int numberOfSelectedBookmarks = bookmarksListView.getCheckedItemCount();
+
+                // Set the action mode subtitle according to the number of selected bookmarks.  This must be set here or it will be missing if the activity is restarted.
+                mode.setSubtitle(getString(R.string.selected) + "  " + numberOfSelectedBookmarks);
+
+                // Do not show the select all menu item if all the bookmarks are already checked.
+                if (bookmarksListView.getCheckedItemCount() == bookmarksListView.getCount()) {
+                    selectAllMenuItem.setVisible(false);
+                }
+
+                // Make it so.
+                return true;
+            }
+
+            @Override
+            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                // Do nothing.
+                return false;
+            }
+
+            @Override
+            public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
+                // Calculate the number of selected bookmarks.
+                int numberOfSelectedBookmarks = bookmarksListView.getCheckedItemCount();
+
+                // Only run the commands if at least one bookmark is selected.  Otherwise, a context menu with 0 selected bookmarks is briefly displayed.
+                if (numberOfSelectedBookmarks > 0) {
+                    // Update the action mode subtitle according to the number of selected bookmarks.
+                    mode.setSubtitle(getString(R.string.selected) + "  " + numberOfSelectedBookmarks);
+
+                    // Only show the select all menu item if all of the bookmarks are not already selected.
+                    selectAllMenuItem.setVisible(bookmarksListView.getCheckedItemCount() != bookmarksListView.getCount());
+
+                    // Convert the database ID to an int.
+                    int databaseId = (int) id;
+
+                    // If a folder was selected, also select all the contents.
+                    if (checked && bookmarksDatabaseHelper.isFolder(databaseId)) {
+                        selectAllBookmarksInFolder(databaseId);
+                    }
+
+                    // Do not allow a bookmark to be deselected if the folder is selected.
+                    if (!checked) {
+                        // Get the folder name.
+                        String folderName = bookmarksDatabaseHelper.getParentFolderName((int) id);
+
+                        // If the bookmark is not in the root folder, check to see if the folder is selected.
+                        if (!folderName.isEmpty()) {
+                            // Get the database ID of the folder.
+                            int folderDatabaseId = bookmarksDatabaseHelper.getFolderDatabaseId(folderName);
+
+                            // Move the bookmarks cursor to the first position.
+                            bookmarksCursor.moveToFirst();
+
+                            // Initialize the folder position variable.
+                            int folderPosition = -1;
+
+                            // Get the position of the folder in the bookmarks cursor.
+                            while ((folderPosition < 0) && (bookmarksCursor.getPosition() < bookmarksCursor.getCount())) {
+                                // Check if the folder database ID matches the bookmark database ID.
+                                if (folderDatabaseId == bookmarksCursor.getInt(bookmarksCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper._ID))) {
+                                    // Get the folder position.
+                                    folderPosition = bookmarksCursor.getPosition();
+
+                                    // Check if the folder is selected.
+                                    if (bookmarksListView.isItemChecked(folderPosition)) {
+                                        // Reselect the bookmark.
+                                        bookmarksListView.setItemChecked(position, true);
+
+                                        // Display a snackbar explaining why the bookmark cannot be deselected.
+                                        Snackbar.make(bookmarksListView, R.string.cannot_deselect_bookmark, Snackbar.LENGTH_LONG).show();
+                                    }
+                                }
+
+                                // Increment the bookmarks cursor.
+                                bookmarksCursor.moveToNext();
+                            }
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
+                // Get a the menu item ID.
+                int menuItemId = menuItem.getItemId();
+
+                // Run the command that corresponds to the selected menu item.
+                if (menuItemId == R.id.select_all) {  // Select all the bookmarks.
+                    // Get the total number of bookmarks.
+                    int numberOfBookmarks = bookmarksListView.getCount();
+
+                    // Select them all.
+                    for (int i = 0; i < numberOfBookmarks; i++) {
+                        bookmarksListView.setItemChecked(i, true);
+                    }
+                } else if (menuItemId == R.id.delete) {  // Delete the selected bookmarks.
+                    // Set the deleting bookmarks flag, which prevents the delete menu item from being enabled until the current process finishes.
+                    deletingBookmarks = true;
+
+                    // Get an array of the selected row IDs.
+                    long[] selectedBookmarksIdsLongArray = bookmarksListView.getCheckedItemIds();
+
+                    // Get an array of checked bookmarks.  `.clone()` makes a copy that won't change if the list view is reloaded, which is needed for re-selecting the bookmarks on undelete.
+                    SparseBooleanArray selectedBookmarksPositionsSparseBooleanArray = bookmarksListView.getCheckedItemPositions().clone();
+
+                    // Update the bookmarks cursor with the current contents of the bookmarks database except for the specified database IDs.
+                    switch (currentFolderDatabaseId) {
+                        // Get a cursor with all the folders.
+                        case ALL_FOLDERS_DATABASE_ID:
+                            if (sortByDisplayOrder) {
+                                bookmarksCursor = bookmarksDatabaseHelper.getAllBookmarksByDisplayOrderExcept(selectedBookmarksIdsLongArray);
+                            } else {
+                                bookmarksCursor = bookmarksDatabaseHelper.getAllBookmarksExcept(selectedBookmarksIdsLongArray);
+                            }
+                            break;
+
+                        // Get a cursor for the home folder.
+                        case HOME_FOLDER_DATABASE_ID:
+                            if (sortByDisplayOrder) {
+                                bookmarksCursor = bookmarksDatabaseHelper.getBookmarksByDisplayOrderExcept(selectedBookmarksIdsLongArray, "");
+                            } else {
+                                bookmarksCursor = bookmarksDatabaseHelper.getBookmarksExcept(selectedBookmarksIdsLongArray, "");
+                            }
+                            break;
+
+                        // Display the selected folder.
+                        default:
+                            // Get a cursor for the selected folder.
+                            if (sortByDisplayOrder) {
+                                bookmarksCursor = bookmarksDatabaseHelper.getBookmarksByDisplayOrderExcept(selectedBookmarksIdsLongArray, currentFolderName);
+                            } else {
+                                bookmarksCursor = bookmarksDatabaseHelper.getBookmarksExcept(selectedBookmarksIdsLongArray, currentFolderName);
+                            }
+                    }
+
+                    // Update the list view.
+                    bookmarksCursorAdapter.changeCursor(bookmarksCursor);
+
+                    // Create a Snackbar with the number of deleted bookmarks.
+                    bookmarksDeletedSnackbar = Snackbar.make(findViewById(R.id.bookmarks_databaseview_coordinatorlayout),
+                            getString(R.string.bookmarks_deleted) + "  " + selectedBookmarksIdsLongArray.length, Snackbar.LENGTH_LONG)
+                            .setAction(R.string.undo, view -> {
+                                // 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) {
+                                    if (event == Snackbar.Callback.DISMISS_EVENT_ACTION) {  // The user pushed the undo button.
+                                        // Update the bookmarks list view with the current contents of the bookmarks database, including the "deleted bookmarks.
+                                        updateBookmarksListView();
+
+                                        // Re-select the previously selected bookmarks.
+                                        for (int i = 0; i < selectedBookmarksPositionsSparseBooleanArray.size(); i++) {
+                                            bookmarksListView.setItemChecked(selectedBookmarksPositionsSparseBooleanArray.keyAt(i), true);
+                                        }
+                                    } else {  // The Snackbar was dismissed without the undo button being pushed.
+                                        // Delete each selected bookmark.
+                                        for (long databaseIdLong : selectedBookmarksIdsLongArray) {
+                                            // Convert `databaseIdLong` to an int.
+                                            int databaseIdInt = (int) databaseIdLong;
+
+                                            // Delete the selected bookmark.
+                                            bookmarksDatabaseHelper.deleteBookmark(databaseIdInt);
+                                        }
+                                    }
+
+                                    // Reset the deleting bookmarks flag.
+                                    deletingBookmarks = false;
+
+                                    // Enable the delete menu item.
+                                    deleteMenuItem.setEnabled(true);
+
+                                    // Close the activity if back has been pressed.
+                                    if (closeActivityAfterDismissingSnackbar) {
+                                        onBackPressed();
+                                    }
+                                }
+                            });
+
+                    // Show the Snackbar.
+                    bookmarksDeletedSnackbar.show();
+                }
+
+                // Consume the click.
+                return false;
+            }
+
+            @Override
+            public void onDestroyActionMode(ActionMode mode) {
+                // Do nothing.
+            }
+        });
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu.
+        getMenuInflater().inflate(R.menu.bookmarks_databaseview_options_menu, menu);
+
+        // Get a handle for the sort menu item.
+        MenuItem sortMenuItem = menu.findItem(R.id.sort);
+
+        // Change the sort menu item icon if the listview is sorted by display order, which restores the state after a restart.
+        if (sortByDisplayOrder) {
+            sortMenuItem.setIcon(R.drawable.sort_selected);
+        }
+
+        // Success.
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem menuItem) {
+        // Get the menu item ID.
+        int menuItemId = menuItem.getItemId();
+
+        // Run the command that corresponds to the selected menu item.
+        if (menuItemId == android.R.id.home) {  // Go Home.  The home arrow is identified as `android.R.id.home`, not just `R.id.home`.
+            // Exit the activity.
+            onBackPressed();
+        } else if (menuItemId == R.id.sort) {  // Toggle the sort mode.
+            // Update the sort by display order tracker.
+            sortByDisplayOrder = !sortByDisplayOrder;
+
+            // Get a handle for the bookmarks list view.
+            ListView bookmarksListView = findViewById(R.id.bookmarks_databaseview_listview);
+
+            // Update the icon and display a snackbar.
+            if (sortByDisplayOrder) {  // Sort by display order.
+                // Update the icon.
+                menuItem.setIcon(R.drawable.sort_selected);
+
+                // Display a Snackbar indicating the current sort type.
+                Snackbar.make(bookmarksListView, R.string.sorted_by_display_order, Snackbar.LENGTH_SHORT).show();
+            } else {  // Sort by database id.
+                // Update the icon.
+                menuItem.setIcon(R.drawable.sort);
+
+                // Display a Snackbar indicating the current sort type.
+                Snackbar.make(bookmarksListView, R.string.sorted_by_database_id, Snackbar.LENGTH_SHORT).show();
+            }
+
+            // Update the list view.
+            updateBookmarksListView();
+        }
+
+        // Consume the event.
+        return true;
+    }
+
+    @Override
+    public void onSaveInstanceState (@NonNull Bundle savedInstanceState) {
+        // Run the default commands.
+        super.onSaveInstanceState(savedInstanceState);
+
+        // Store the class variables in the bundle.
+        savedInstanceState.putInt(CURRENT_FOLDER_DATABASE_ID, currentFolderDatabaseId);
+        savedInstanceState.putString(CURRENT_FOLDER_NAME, currentFolderName);
+        savedInstanceState.putBoolean(SORT_BY_DISPLAY_ORDER, sortByDisplayOrder);
+    }
+
+    @Override
+    public void onBackPressed() {
+        // Check to see if a snackbar is currently displayed.  If so, it must be closed before existing so that a pending delete is completed before reloading the list view in the bookmarks activity.
+        if ((bookmarksDeletedSnackbar != null) && bookmarksDeletedSnackbar.isShown()) { // Close the bookmarks deleted snackbar before going home.
+            // Set the close flag.
+            closeActivityAfterDismissingSnackbar = true;
+
+            // Dismiss the snackbar.
+            bookmarksDeletedSnackbar.dismiss();
+        } else {  // Go home immediately.
+            // Update the current folder in the bookmarks activity.
+            if ((currentFolderDatabaseId == ALL_FOLDERS_DATABASE_ID) || (currentFolderDatabaseId == HOME_FOLDER_DATABASE_ID)) {  // All folders or the the home folder are currently displayed.
+                // Load the home folder.
+                BookmarksActivity.currentFolder = "";
+            } else {  // A subfolder is currently displayed.
+                // Load the current folder.
+                BookmarksActivity.currentFolder = currentFolderName;
+            }
+
+            // Reload the bookmarks list view when returning to the bookmarks activity.
+            BookmarksActivity.restartFromBookmarksDatabaseViewActivity = true;
+
+            // Exit the bookmarks database view activity.
+            super.onBackPressed();
+        }
+    }
+
+    private void updateBookmarksListView() {
+        // Populate the bookmarks list view based on the spinner selection.
+        switch (currentFolderDatabaseId) {
+            // Get a cursor with all the folders.
+            case ALL_FOLDERS_DATABASE_ID:
+                if (sortByDisplayOrder) {
+                    bookmarksCursor = bookmarksDatabaseHelper.getAllBookmarksByDisplayOrder();
+                } else {
+                    bookmarksCursor = bookmarksDatabaseHelper.getAllBookmarks();
+                }
+                break;
+
+            // Get a cursor for the home folder.
+            case HOME_FOLDER_DATABASE_ID:
+                if (sortByDisplayOrder) {
+                    bookmarksCursor = bookmarksDatabaseHelper.getBookmarksByDisplayOrder("");
+                } else {
+                    bookmarksCursor = bookmarksDatabaseHelper.getBookmarks("");
+                }
+                break;
+
+            // Display the selected folder.
+            default:
+                // Get a cursor for the selected folder.
+                if (sortByDisplayOrder) {
+                    bookmarksCursor = bookmarksDatabaseHelper.getBookmarksByDisplayOrder(currentFolderName);
+                } else {
+                    bookmarksCursor = bookmarksDatabaseHelper.getBookmarks(currentFolderName);
+                }
+        }
+
+        // Update the cursor adapter if it isn't null, which happens when the activity is restarted.
+        if (bookmarksCursorAdapter != null) {
+            bookmarksCursorAdapter.changeCursor(bookmarksCursor);
+        }
+    }
+
+    private void selectAllBookmarksInFolder(int folderId) {
+        // Get a handle for the bookmarks list view.
+        ListView bookmarksListView = findViewById(R.id.bookmarks_databaseview_listview);
+
+        // Get the folder name.
+        String folderName = bookmarksDatabaseHelper.getFolderName(folderId);
+
+        // Get a cursor with the contents of the folder.
+        Cursor folderCursor = bookmarksDatabaseHelper.getBookmarks(folderName);
+
+        // Move to the beginning of the cursor.
+        folderCursor.moveToFirst();
+
+        while (folderCursor.getPosition() < folderCursor.getCount()) {
+            // Get the bookmark database ID.
+            int bookmarkId = folderCursor.getInt(folderCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper._ID));
+
+            // Move the bookmarks cursor to the first position.
+            bookmarksCursor.moveToFirst();
+
+            // Initialize the bookmark position variable.
+            int bookmarkPosition = -1;
+
+            // Get the position of this bookmark in the bookmarks cursor.
+            while ((bookmarkPosition < 0) && (bookmarksCursor.getPosition() < bookmarksCursor.getCount())) {
+                // Check if the bookmark IDs match.
+                if (bookmarkId == bookmarksCursor.getInt(bookmarksCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper._ID))) {
+                    // Get the bookmark position.
+                    bookmarkPosition = bookmarksCursor.getPosition();
+
+                    // If this bookmark is a folder, select all the bookmarks inside it.
+                    if (bookmarksDatabaseHelper.isFolder(bookmarkId)) {
+                        selectAllBookmarksInFolder(bookmarkId);
+                    }
+
+                    // Select the bookmark.
+                    bookmarksListView.setItemChecked(bookmarkPosition, true);
+                }
+
+                // Increment the bookmarks cursor position.
+                bookmarksCursor.moveToNext();
+            }
+
+            // Move to the next position.
+            folderCursor.moveToNext();
+        }
+    }
+
+    @Override
+    public void onSaveBookmark(DialogFragment dialogFragment, int selectedBookmarkDatabaseId, @NonNull Bitmap favoriteIconBitmap) {
+        // Get the dialog from the dialog fragment.
+        Dialog dialog = dialogFragment.getDialog();
+
+        // Remove the incorrect lint warning below that the dialog might be null.
+        assert dialog != null;
+
+        // Get handles for the views from dialog fragment.
+        RadioButton currentIconRadioButton = dialog.findViewById(R.id.current_icon_radiobutton);
+        EditText bookmarkNameEditText = dialog.findViewById(R.id.bookmark_name_edittext);
+        EditText bookmarkUrlEditText = dialog.findViewById(R.id.bookmark_url_edittext);
+        Spinner folderSpinner = dialog.findViewById(R.id.bookmark_folder_spinner);
+        EditText displayOrderEditText = dialog.findViewById(R.id.bookmark_display_order_edittext);
+
+        // Extract the bookmark information.
+        String bookmarkNameString = bookmarkNameEditText.getText().toString();
+        String bookmarkUrlString = bookmarkUrlEditText.getText().toString();
+        int folderDatabaseId = (int) folderSpinner.getSelectedItemId();
+        int displayOrderInt = Integer.parseInt(displayOrderEditText.getText().toString());
+
+        // Instantiate the parent folder name `String`.
+        String parentFolderNameString;
+
+        // Set the parent folder name.
+        if (folderDatabaseId == HOME_FOLDER_DATABASE_ID) {  // The home folder is selected.  Use `""`.
+            parentFolderNameString = "";
+        } else {  // Get the parent folder name from the database.
+            parentFolderNameString = bookmarksDatabaseHelper.getFolderName(folderDatabaseId);
+        }
+
+        // Update the bookmark.
+        if (currentIconRadioButton.isChecked()) {  // Update the bookmark without changing the favorite icon.
+            bookmarksDatabaseHelper.updateBookmark(selectedBookmarkDatabaseId, bookmarkNameString, bookmarkUrlString, parentFolderNameString, displayOrderInt);
+        } else {  // Update the bookmark using the `WebView` favorite icon.
+            // Create a favorite icon byte array output stream.
+            ByteArrayOutputStream newFavoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
+
+            // Convert the favorite icon bitmap to a byte array.  `0` is for lossless compression (the only option for a PNG).
+            favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, newFavoriteIconByteArrayOutputStream);
+
+            // Convert the favorite icon byte array stream to a byte array.
+            byte[] newFavoriteIconByteArray = newFavoriteIconByteArrayOutputStream.toByteArray();
+
+            //  Update the bookmark and the favorite icon.
+            bookmarksDatabaseHelper.updateBookmark(selectedBookmarkDatabaseId, bookmarkNameString, bookmarkUrlString, parentFolderNameString, displayOrderInt, newFavoriteIconByteArray);
+        }
+
+        // Update the list view.
+        updateBookmarksListView();
+    }
+
+    @Override
+    public void onSaveBookmarkFolder(DialogFragment dialogFragment, int selectedBookmarkDatabaseId, @NonNull Bitmap favoriteIconBitmap) {
+        // Get the dialog from the dialog fragment.
+        Dialog dialog = dialogFragment.getDialog();
+
+        // Remove the incorrect lint warning below that the dialog might be null.
+        assert dialog != null;
+
+        // Get handles for the views from dialog fragment.
+        RadioButton currentIconRadioButton = dialog.findViewById(R.id.current_icon_radiobutton);
+        RadioButton defaultIconRadioButton = dialog.findViewById(R.id.default_icon_radiobutton);
+        ImageView defaultIconImageView = dialog.findViewById(R.id.default_icon_imageview);
+        EditText folderNameEditText = dialog.findViewById(R.id.folder_name_edittext);
+        Spinner parentFolderSpinner = dialog.findViewById(R.id.parent_folder_spinner);
+        EditText displayOrderEditText = dialog.findViewById(R.id.display_order_edittext);
+
+        // Extract the folder information.
+        String newFolderNameString = folderNameEditText.getText().toString();
+        int parentFolderDatabaseId = (int) parentFolderSpinner.getSelectedItemId();
+        int displayOrderInt = Integer.parseInt(displayOrderEditText.getText().toString());
+
+        // Instantiate the parent folder name `String`.
+        String parentFolderNameString;
+
+        // Set the parent folder name.
+        if (parentFolderDatabaseId == HOME_FOLDER_DATABASE_ID) {  // The home folder is selected.  Use `""`.
+            parentFolderNameString = "";
+        } else {  // Get the parent folder name from the database.
+            parentFolderNameString = bookmarksDatabaseHelper.getFolderName(parentFolderDatabaseId);
+        }
+
+        // Update the folder.
+        if (currentIconRadioButton.isChecked()) {  // Update the folder without changing the favorite icon.
+            bookmarksDatabaseHelper.updateFolder(selectedBookmarkDatabaseId, oldFolderNameString, newFolderNameString, parentFolderNameString, displayOrderInt);
+        } else {  // Update the folder and the icon.
+            // Create the new folder icon Bitmap.
+            Bitmap folderIconBitmap;
+
+            // Populate the new folder icon bitmap.
+            if (defaultIconRadioButton.isChecked()) {
+                // Get the default folder icon drawable.
+                Drawable folderIconDrawable = defaultIconImageView.getDrawable();
+
+                // Convert the folder icon drawable to a bitmap drawable.
+                BitmapDrawable folderIconBitmapDrawable = (BitmapDrawable) folderIconDrawable;
+
+                // Convert the folder icon bitmap drawable to a bitmap.
+                folderIconBitmap = folderIconBitmapDrawable.getBitmap();
+            } else {  // Use the `WebView` favorite icon.
+                // Get a copy of the favorite icon bitmap.
+                folderIconBitmap = favoriteIconBitmap;
+            }
+
+            // Create a folder icon byte array output stream.
+            ByteArrayOutputStream newFolderIconByteArrayOutputStream = new ByteArrayOutputStream();
+
+            // Convert the folder icon bitmap to a byte array.  `0` is for lossless compression (the only option for a PNG).
+            folderIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, newFolderIconByteArrayOutputStream);
+
+            // Convert the folder icon byte array stream to a byte array.
+            byte[] newFolderIconByteArray = newFolderIconByteArrayOutputStream.toByteArray();
+
+            //  Update the folder and the icon.
+            bookmarksDatabaseHelper.updateFolder(selectedBookmarkDatabaseId, oldFolderNameString, newFolderNameString, parentFolderNameString, displayOrderInt, newFolderIconByteArray);
+        }
+
+        // Update the list view.
+        updateBookmarksListView();
+    }
+
+    @Override
+    public void onDestroy() {
+        // Close the bookmarks cursor and database.
+        bookmarksCursor.close();
+        bookmarksDatabaseHelper.close();
+
+        // Run the default commands.
+        super.onDestroy();
     }
 }
\ No newline at end of file