/*
- * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
package com.stoutner.privacybrowser.activities;
+import android.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.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.CursorAdapter;
-import android.support.v4.widget.ResourceCursorAdapter;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-// `AppCompatDialogFragment` is required instead of `DialogFragment` or an error is produced on API <=22.
-import android.support.v7.app.AppCompatDialogFragment;
-import android.support.v7.widget.Toolbar;
+import android.preference.PreferenceManager;
import android.util.SparseBooleanArray;
import android.view.ActionMode;
import android.view.Menu;
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;
import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
public class BookmarksDatabaseViewActivity extends AppCompatActivity implements EditBookmarkDatabaseViewDialog.EditBookmarkDatabaseViewListener,
EditBookmarkFolderDatabaseViewDialog.EditBookmarkFolderDatabaseViewListener {
- // Instantiate the constants.
+ // Define the class constants.
private static final int ALL_FOLDERS_DATABASE_ID = -2;
- private static final int HOME_FOLDER_DATABASE_ID = -1;
-
- // `bookmarksDatabaseHelper` is used in `onCreate()`, `updateBookmarksListView()`, `selectAllBookmarksInFolder()`, and `onDestroy()`.
- private BookmarksDatabaseHelper bookmarksDatabaseHelper;
-
- // `bookmarksCursor` is used in `onCreate()`, `updateBookmarksListView()`, `onSaveBookmark()`, `onSaveBookmarkFolder()`, and `onDestroy()`.
- private Cursor bookmarksCursor;
+ public static final int HOME_FOLDER_DATABASE_ID = -1;
- // `bookmarksCursorAdapter` is used in `onCreate()`, `selectAllBookmarksInFolder()`, and `updateBookmarksListView()`.
- private CursorAdapter bookmarksCursorAdapter;
-
- // `oldFolderNameString` is used in `onCreate()` and `onSaveBookmarkFolder()`.
- private String oldFolderNameString;
+ // 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";
- // `currentFolderDatabaseId` is used in `onCreate()`, `updateBookmarksListView()`, `onSaveBookmark()`, and `onSaveBookmarkFolder()`.
+ // Define the class variables.
private int currentFolderDatabaseId;
-
- // `currentFolder` is used in `onCreate()`, `onSaveBookmark()`, and `onSaveBookmarkFolder()`.
private String currentFolderName;
-
- // `sortByDisplayOrder` is used in `onCreate()`, `onOptionsItemSelected()`, and `updateBookmarksListView()`.
private boolean sortByDisplayOrder;
-
- // `bookmarksDeletedSnackbar` is used in `onCreate()`, `onOptionsItemSelected()`, and `onBackPressed()`.
+ private BookmarksDatabaseHelper bookmarksDatabaseHelper;
+ private Cursor bookmarksCursor;
+ private CursorAdapter bookmarksCursorAdapter;
+ private String oldFolderNameString;
private Snackbar bookmarksDeletedSnackbar;
-
- // `closeActivityAfterDismissingSnackbar` is used in `onCreate()`, `onOptionsItemSelected()`, and `onBackPressed()`.
private boolean closeActivityAfterDismissingSnackbar;
@Override
public void onCreate(Bundle savedInstanceState) {
+ // Get a handle for the shared preferences.
+ SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ // Get the screenshot preference.
+ boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false);
+
// Disable screenshots if not allowed.
- if (!MainWebViewActivity.allowScreenshots) {
+ if (!allowScreenshots) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
// Set the activity theme.
- if (MainWebViewActivity.darkTheme) {
- setTheme(R.style.PrivacyBrowserDark_SecondaryActivity);
- } else {
- setTheme(R.style.PrivacyBrowserLight_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 content view.
setContentView(R.layout.bookmarks_databaseview_coordinatorlayout);
- // The `SupportActionBar` from `android.support.v7.app.ActionBar` must be used until the minimum API is >= 21.
- Toolbar bookmarksDatabaseViewAppBar = findViewById(R.id.bookmarks_databaseview_toolbar);
- setSupportActionBar(bookmarksDatabaseViewAppBar);
+ // Get a handle for the toolbar.
+ Toolbar toolbar = findViewById(R.id.bookmarks_databaseview_toolbar);
- // Get a handle for the `AppBar`.
- ActionBar appBar = getSupportActionBar();
+ // Set the support action bar.
+ setSupportActionBar(toolbar);
- // Remove the incorrect warning in Android Studio that `appBar` might be null.
- assert appBar != null;
+ // Get a handle for the action bar.
+ ActionBar actionBar = getSupportActionBar();
- // Display the spinner and the back arrow in the app bar.
- appBar.setCustomView(R.layout.spinner);
- appBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM | ActionBar.DISPLAY_HOME_AS_UP);
+ // Remove the incorrect lint warning that the action bar might be null.
+ assert actionBar != null;
- // Initialize the database handler. `this` specifies the context. 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);
// Setup a matrix cursor for "All Folders" and "Home Folder".
// Get a cursor with the list of all the folders.
Cursor foldersCursor = bookmarksDatabaseHelper.getAllFolders();
- // Combine `matrixCursor` and `foldersCursor`.
+ // 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 a handle for the spinner item text view.
+ // 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.getColumnIndex(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.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)));
}
Spinner folderSpinner = findViewById(R.id.spinner);
folderSpinner.setAdapter(foldersCursorAdapter);
- // 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;
+ // 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);
+ // Get a handle for the selected view.
+ TextView selectedFolderTextView = findViewById(R.id.spinner_item_textview);
- // Store the current folder name.
- currentFolderName = selectedFolderTextView.getText().toString();
+ // Store the current folder name.
+ currentFolderName = selectedFolderTextView.getText().toString();
- // Update the list view.
- updateBookmarksListView();
- }
+ // Update the list view.
+ updateBookmarksListView();
+ }
- @Override
- public void onNothingSelected(AdapterView<?> parent) {
- // Do nothing.
- }
+ @Override
+ public void onNothingSelected(AdapterView<?> parent) {
+ // Do nothing.
+ }
+ });
});
- // Get a handle for the bookmarks `ListView`.
+
+ // Get a handle for the bookmarks listview.
ListView bookmarksListView = findViewById(R.id.bookmarks_databaseview_listview);
- // Get a `Cursor` with the current contents of the bookmarks database.
- bookmarksCursor = bookmarksDatabaseHelper.getAllBookmarks();
+ // 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 a `CursorAdapter` with `this` context. `false` disables autoRequery.
bookmarksCursorAdapter = new CursorAdapter(this, bookmarksCursor, false) {
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));
// Update the ListView.
bookmarksListView.setAdapter(bookmarksCursorAdapter);
- // Set the current folder database ID.
- currentFolderDatabaseId = ALL_FOLDERS_DATABASE_ID;
-
// 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.
oldFolderNameString = bookmarksCursor.getString(bookmarksCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME));
// Show the edit bookmark folder dialog.
- AppCompatDialogFragment editBookmarkFolderDatabaseViewDialog = EditBookmarkFolderDatabaseViewDialog.folderDatabaseId(databaseId);
+ DialogFragment editBookmarkFolderDatabaseViewDialog = EditBookmarkFolderDatabaseViewDialog.folderDatabaseId(databaseId, favoriteIconBitmap);
editBookmarkFolderDatabaseViewDialog.show(getSupportFragmentManager(), getResources().getString(R.string.edit_folder));
} else {
// Show the edit bookmark dialog.
- AppCompatDialogFragment editBookmarkDatabaseViewDialog = EditBookmarkDatabaseViewDialog.bookmarkDatabaseId(databaseId);
+ DialogFragment editBookmarkDatabaseViewDialog = EditBookmarkDatabaseViewDialog.bookmarkDatabaseId(databaseId, favoriteIconBitmap);
editBookmarkDatabaseViewDialog.show(getSupportFragmentManager(), getResources().getString(R.string.edit_bookmark));
}
});
// 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;
}
// Calculate the number of selected bookmarks.
int numberOfSelectedBookmarks = bookmarksListView.getCheckedItemCount();
- // Adjust the ActionMode according to the number of selected bookmarks.
+ // Update the action mode subtitle according to the number of selected bookmarks.
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()) {
+ // Update the visibility of the the select all menu.
+ if (bookmarksListView.getCheckedItemCount() == bookmarksListView.getCount()) { // All of the bookmarks are checked.
+ // Hide the select all menu item.
selectAllMenuItem.setVisible(false);
- } else {
+ } else { // Not all of the bookmarks are checked.
+ // Show the select all menu item.
selectAllMenuItem.setVisible(true);
}
// Update the list view.
bookmarksCursorAdapter.changeCursor(bookmarksCursor);
- // Show a Snackbar with the number of deleted bookmarks.
+ // 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) {
- switch (event) {
- // The user pushed the `Undo` button.
- case Snackbar.Callback.DISMISS_EVENT_ACTION:
- // 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);
- }
- break;
-
- // The Snackbar was dismissed without the `Undo` button being pushed.
- default:
- // Delete each selected bookmark.
- for (long databaseIdLong : selectedBookmarksIdsLongArray) {
- // Convert `databaseIdLong` to an int.
- int databaseIdInt = (int) databaseIdLong;
-
- // Delete the selected bookmark.
- bookmarksDatabaseHelper.deleteBookmark(databaseIdInt);
- }
+ 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.
// Inflate the menu.
getMenuInflater().inflate(R.menu.bookmarks_databaseview_options_menu, menu);
+ // Get the current theme status.
+ int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+
+ // 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) {
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ sortMenuItem.setIcon(R.drawable.sort_selected_day);
+ } else {
+ sortMenuItem.setIcon(R.drawable.sort_selected_night);
+ }
+ }
+
// Success.
return true;
}
// Get the ID of the menu item that was selected.
int menuItemId = menuItem.getItemId();
+ // Run the command that corresponds to the selected menu item.
switch (menuItemId) {
case android.R.id.home: // The home arrow is identified as `android.R.id.home`, not just `R.id.home`.
// Exit the activity.
onBackPressed();
break;
- case R.id.options_menu_sort:
+ case R.id.sort:
// Update the sort by display order tracker.
sortByDisplayOrder = !sortByDisplayOrder;
- // Get a handle for the bookmarks `ListView`.
+ // Get a handle for the bookmarks list view.
ListView bookmarksListView = findViewById(R.id.bookmarks_databaseview_listview);
+ // Get the current theme status.
+ int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+
// Update the icon and display a snackbar.
if (sortByDisplayOrder) { // Sort by display order.
// Update the icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
- menuItem.setIcon(R.drawable.sort_selected_dark);
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ menuItem.setIcon(R.drawable.sort_selected_day);
} else {
- menuItem.setIcon(R.drawable.sort_selected_light);
+ menuItem.setIcon(R.drawable.sort_selected_night);
}
// 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 according to the theme.
- if (MainWebViewActivity.darkTheme) {
- menuItem.setIcon(R.drawable.sort_dark);
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ menuItem.setIcon(R.drawable.sort_day);
} else {
- menuItem.setIcon(R.drawable.sort_light);
+ menuItem.setIcon(R.drawable.sort_night);
}
// Display a Snackbar indicating the current sort type.
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.
bookmarksDeletedSnackbar.dismiss();
} else { // Go home immediately.
// Update the current folder in the bookmarks activity.
- switch (currentFolderDatabaseId) {
- case ALL_FOLDERS_DATABASE_ID:
- // Load the home folder.
- BookmarksActivity.currentFolder = "";
- break;
-
- case HOME_FOLDER_DATABASE_ID:
- // Load the home folder.
- BookmarksActivity.currentFolder = "";
- break;
-
- default:
- // Load the current folder.
- BookmarksActivity.currentFolder = currentFolderName;
+ 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.
}
}
- // Update the list view.
- bookmarksCursorAdapter.changeCursor(bookmarksCursor);
+ // 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) {
}
@Override
- public void onSaveBookmark(AppCompatDialogFragment dialogFragment, int selectedBookmarkDatabaseId) {
+ 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 currentBookmarkIconRadioButton = dialogFragment.getDialog().findViewById(R.id.edit_bookmark_current_icon_radiobutton);
- EditText editBookmarkNameEditText = dialogFragment.getDialog().findViewById(R.id.edit_bookmark_name_edittext);
- EditText editBookmarkUrlEditText = dialogFragment.getDialog().findViewById(R.id.edit_bookmark_url_edittext);
- Spinner folderSpinner = dialogFragment.getDialog().findViewById(R.id.edit_bookmark_folder_spinner);
- EditText displayOrderEditText = dialogFragment.getDialog().findViewById(R.id.edit_bookmark_display_order_edittext);
+ RadioButton currentBookmarkIconRadioButton = dialog.findViewById(R.id.edit_bookmark_current_icon_radiobutton);
+ EditText editBookmarkNameEditText = dialog.findViewById(R.id.edit_bookmark_name_edittext);
+ EditText editBookmarkUrlEditText = dialog.findViewById(R.id.edit_bookmark_url_edittext);
+ Spinner folderSpinner = dialog.findViewById(R.id.edit_bookmark_folder_spinner);
+ EditText displayOrderEditText = dialog.findViewById(R.id.edit_bookmark_display_order_edittext);
// Extract the bookmark information.
String bookmarkNameString = editBookmarkNameEditText.getText().toString();
String bookmarkUrlString = editBookmarkUrlEditText.getText().toString();
int folderDatabaseId = (int) folderSpinner.getSelectedItemId();
- int displayOrderInt = Integer.valueOf(displayOrderEditText.getText().toString());
+ int displayOrderInt = Integer.parseInt(displayOrderEditText.getText().toString());
// Instantiate the parent folder name `String`.
String parentFolderNameString;
// Set the parent folder name.
- if (folderDatabaseId == EditBookmarkDatabaseViewDialog.HOME_FOLDER_DATABASE_ID) { // The home folder is selected. Use `""`.
+ 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);
if (currentBookmarkIconRadioButton.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.
- // Convert the favorite icon to a byte array. `0` is for lossless compression (the only option for a PNG).
+ // Create a favorite icon byte array output stream.
ByteArrayOutputStream newFavoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
- MainWebViewActivity.favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, newFavoriteIconByteArrayOutputStream);
+
+ // 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.
}
@Override
- public void onSaveBookmarkFolder(AppCompatDialogFragment dialogFragment, int selectedBookmarkDatabaseId) {
+ public void onSaveBookmarkFolder(DialogFragment dialogFragment, int selectedBookmarkDatabaseId, 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 currentBookmarkIconRadioButton = dialogFragment.getDialog().findViewById(R.id.edit_folder_current_icon_radiobutton);
- RadioButton defaultFolderIconRadioButton = dialogFragment.getDialog().findViewById(R.id.edit_folder_default_icon_radiobutton);
- ImageView defaultFolderIconImageView = dialogFragment.getDialog().findViewById(R.id.edit_folder_default_icon_imageview);
- EditText editBookmarkNameEditText = dialogFragment.getDialog().findViewById(R.id.edit_folder_name_edittext);
- Spinner parentFolderSpinner = dialogFragment.getDialog().findViewById(R.id.edit_folder_parent_folder_spinner);
- EditText displayOrderEditText = dialogFragment.getDialog().findViewById(R.id.edit_folder_display_order_edittext);
+ RadioButton currentBookmarkIconRadioButton = dialog.findViewById(R.id.edit_folder_current_icon_radiobutton);
+ RadioButton defaultFolderIconRadioButton = dialog.findViewById(R.id.edit_folder_default_icon_radiobutton);
+ ImageView defaultFolderIconImageView = dialog.findViewById(R.id.edit_folder_default_icon_imageview);
+ EditText editBookmarkNameEditText = dialog.findViewById(R.id.edit_folder_name_edittext);
+ Spinner parentFolderSpinner = dialog.findViewById(R.id.edit_folder_parent_folder_spinner);
+ EditText displayOrderEditText = dialog.findViewById(R.id.edit_folder_display_order_edittext);
// Extract the folder information.
String newFolderNameString = editBookmarkNameEditText.getText().toString();
int parentFolderDatabaseId = (int) parentFolderSpinner.getSelectedItemId();
- int displayOrderInt = Integer.valueOf(displayOrderEditText.getText().toString());
+ int displayOrderInt = Integer.parseInt(displayOrderEditText.getText().toString());
// Instantiate the parent folder name `String`.
String parentFolderNameString;
// Set the parent folder name.
- if (parentFolderDatabaseId == EditBookmarkFolderDatabaseViewDialog.HOME_FOLDER_DATABASE_ID) { // The home folder is selected. Use `""`.
+ 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);
if (currentBookmarkIconRadioButton.isChecked()) { // Update the folder without changing the favorite icon.
bookmarksDatabaseHelper.updateFolder(selectedBookmarkDatabaseId, oldFolderNameString, newFolderNameString, parentFolderNameString, displayOrderInt);
} else { // Update the folder and the icon.
- // Instantiate the new folder icon `Bitmap`.
+ // Create the new folder icon Bitmap.
Bitmap folderIconBitmap;
// Populate the new folder icon bitmap.
if (defaultFolderIconRadioButton.isChecked()) {
- // Get the default folder icon and convert it to a `Bitmap`.
+ // Get the default folder icon drawable.
Drawable folderIconDrawable = defaultFolderIconImageView.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.
- folderIconBitmap = MainWebViewActivity.favoriteIconBitmap;
+ // Get a copy of the favorite icon bitmap.
+ folderIconBitmap = favoriteIconBitmap;
}
- // Convert the folder icon to a byte array. `0` is for lossless compression (the only option for a PNG).
+ // 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.