X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkDatabaseViewDialog.java;h=d58ae113b619ec83ba42caade9c5ae118c1a287f;hp=e24c893bd5c4877818f2109fe6aafcf3b384e72f;hb=ff636c77836983a078f33e60616204518dab61d1;hpb=012e5595c82d6e8d0b8a46f1ef18a02a56341182 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.java index e24c893b..d58ae113 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2018 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -30,10 +30,6 @@ import android.database.MergeCursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; -import android.support.annotation.NonNull; -// `AppCompatDialogFragment` is required instead of `DialogFragment` or an error is produced on API <=22. -import android.support.v4.widget.ResourceCursorAdapter; -import android.support.v7.app.AppCompatDialogFragment; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -45,6 +41,7 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.RadioButton; import android.widget.RadioGroup; +import android.widget.ResourceCursorAdapter; import android.widget.Spinner; import android.widget.TextView; @@ -52,26 +49,23 @@ import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper; -public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { - // Instantiate the constants. +import java.io.ByteArrayOutputStream; + +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.DialogFragment; // The AndroidX dialog fragment must be used or an error is produced on API <=22. + +public class EditBookmarkDatabaseViewDialog extends DialogFragment { + // Define the home folder database ID constant. public static final int HOME_FOLDER_DATABASE_ID = -1; - // Instantiate the class variables. + // Define the edit bookmark database view listener. private EditBookmarkDatabaseViewListener editBookmarkDatabaseViewListener; - private String currentBookmarkName; - private String currentUrl; - private int currentFolderDatabaseId; - private String currentDisplayOrder; - private RadioButton newIconRadioButton; - private EditText nameEditText; - private EditText urlEditText; - private Spinner folderSpinner; - private EditText displayOrderEditText; - private Button editButton; + // The public interface is used to send information back to the parent activity. public interface EditBookmarkDatabaseViewListener { - void onSaveBookmark(AppCompatDialogFragment dialogFragment, int selectedBookmarkDatabaseId); + void onSaveBookmark(DialogFragment dialogFragment, int selectedBookmarkDatabaseId, Bitmap favoriteIconBitmap); } @Override @@ -79,22 +73,33 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { // Run the default commands. super.onAttach(context); - // Get a handle for `EditBookmarkDatabaseViewListener` from the launching context. - + // Get a handle for edit bookmark database view listener from the launching context. editBookmarkDatabaseViewListener = (EditBookmarkDatabaseViewListener) context; } - // Store the database ID in the arguments bundle. - public static EditBookmarkDatabaseViewDialog bookmarkDatabaseId(int databaseId) { - // Create a bundle. - Bundle bundle = new Bundle(); - // Store the bookmark database ID in the bundle. - bundle.putInt("Database ID", databaseId); + public static EditBookmarkDatabaseViewDialog bookmarkDatabaseId(int databaseId, Bitmap favoriteIconBitmap) { + // Create a favorite icon byte array output stream. + ByteArrayOutputStream favoriteIconByteArrayOutputStream = new ByteArrayOutputStream(); + + // Convert the favorite icon to a PNG and place it in the byte array output stream. `0` is for lossless compression (the only option for a PNG). + favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream); - // Add the bundle to the dialog. + // Convert the byte array output stream to a byte array. + byte[] favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray(); + + // Create an arguments bundle. + Bundle argumentsBundle = new Bundle(); + + // Store the variables in the bundle. + argumentsBundle.putInt("database_id", databaseId); + argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray); + + // Create a new instance of the dialog. EditBookmarkDatabaseViewDialog editBookmarkDatabaseViewDialog = new EditBookmarkDatabaseViewDialog(); - editBookmarkDatabaseViewDialog.setArguments(bundle); + + // Add the arguments bundle to the dialog. + editBookmarkDatabaseViewDialog.setArguments(argumentsBundle); // Return the new dialog. return editBookmarkDatabaseViewDialog; @@ -105,17 +110,29 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { - // Remove the incorrect lint warning below that `getInt()` might be null. - assert getArguments() != null; + // Get the arguments. + Bundle arguments = getArguments(); + + // Remove the incorrect lint warning below that the arguments might be null. + assert arguments != null; // Get the bookmark database ID from the bundle. - int bookmarkDatabaseId = getArguments().getInt("Database ID"); + int bookmarkDatabaseId = getArguments().getInt("database_id"); + + // Get the favorite icon byte array. + byte[] favoriteIconByteArray = arguments.getByteArray("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. + Bitmap favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.length); // Initialize the database helper. The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`. BookmarksDatabaseHelper bookmarksDatabaseHelper = new BookmarksDatabaseHelper(getContext(), null, null, 0); // Get a cursor with the selected bookmark and move it to the first position. - Cursor bookmarkCursor = bookmarksDatabaseHelper.getBookmarkCursor(bookmarkDatabaseId); + Cursor bookmarkCursor = bookmarksDatabaseHelper.getBookmark(bookmarkDatabaseId); bookmarkCursor.moveToFirst(); // Use an alert dialog builder to create the alert dialog. @@ -142,10 +159,10 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { // Do nothing. The `AlertDialog` will close automatically. }); - // Set the listener fo the positive button. + // Set the listener for the positive button. dialogBuilder.setPositiveButton(R.string.save, (DialogInterface dialog, int which) -> { // Return the `DialogFragment` to the parent activity on save. - editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId); + editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap); }); // Create an alert dialog from the alert dialog builder`. @@ -159,9 +176,6 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); } - // Set the keyboard to be hidden when the `AlertDialog` is first shown. If this is not set, the `AlertDialog` will not shrink when the keyboard is displayed. - alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); - // The alert dialog must be shown before items in the layout can be modified. alertDialog.show(); @@ -170,17 +184,17 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { RadioGroup iconRadioGroup = alertDialog.findViewById(R.id.edit_bookmark_icon_radiogroup); ImageView currentIconImageView = alertDialog.findViewById(R.id.edit_bookmark_current_icon); ImageView newFavoriteIconImageView = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon); - newIconRadioButton = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon_radiobutton); - nameEditText = alertDialog.findViewById(R.id.edit_bookmark_name_edittext); - urlEditText = alertDialog.findViewById(R.id.edit_bookmark_url_edittext); - folderSpinner = alertDialog.findViewById(R.id.edit_bookmark_folder_spinner); - displayOrderEditText = alertDialog.findViewById(R.id.edit_bookmark_display_order_edittext); - editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); + RadioButton newIconRadioButton = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon_radiobutton); + EditText nameEditText = alertDialog.findViewById(R.id.edit_bookmark_name_edittext); + EditText urlEditText = alertDialog.findViewById(R.id.edit_bookmark_url_edittext); + Spinner folderSpinner = alertDialog.findViewById(R.id.edit_bookmark_folder_spinner); + EditText displayOrderEditText = alertDialog.findViewById(R.id.edit_bookmark_display_order_edittext); + Button editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); // Store the current bookmark values. - currentBookmarkName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)); - currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL)); - currentDisplayOrder = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)); + String currentBookmarkName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)); + String currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL)); + int currentDisplayOrder = bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)); // Set the database ID. databaseIdTextView.setText(String.valueOf(bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper._ID)))); @@ -194,20 +208,20 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { // Display `currentIconBitmap` in `edit_bookmark_current_icon`. currentIconImageView.setImageBitmap(currentIconBitmap); - // Get a `Bitmap` of the favorite icon from `MainWebViewActivity` and display it in `edit_bookmark_web_page_favorite_icon`. - newFavoriteIconImageView.setImageBitmap(MainWebViewActivity.favoriteIconBitmap); + // Set the new favorite icon bitmap. + newFavoriteIconImageView.setImageBitmap(favoriteIconBitmap); // Populate the bookmark name and URL `EditTexts`. nameEditText.setText(currentBookmarkName); urlEditText.setText(currentUrl); - // Setup a `MatrixCursor` "Home Folder". + // Setup a matrix cursor for "Home Folder". String[] matrixCursorColumnNames = {BookmarksDatabaseHelper._ID, BookmarksDatabaseHelper.BOOKMARK_NAME}; MatrixCursor matrixCursor = new MatrixCursor(matrixCursorColumnNames); 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.getAllFoldersCursor(); + // Get a cursor with the list of all the folders. + Cursor foldersCursor = bookmarksDatabaseHelper.getAllFolders(); // Combine `matrixCursor` and `foldersCursor`. MergeCursor foldersMergeCursor = new MergeCursor(new Cursor[]{matrixCursor, foldersCursor}); @@ -215,20 +229,36 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { // Remove the incorrect lint warning below that `getContext()` might be null. assert getContext() != null; - // Create a `ResourceCursorAdapter` for the `Spinner`. `0` specifies no flags.; - ResourceCursorAdapter foldersCursorAdapter = new ResourceCursorAdapter(getContext(), R.layout.edit_bookmark_databaseview_spinner_item, foldersMergeCursor, 0) { + // Create a resource cursor adapter for the spinner. + ResourceCursorAdapter foldersCursorAdapter = new ResourceCursorAdapter(getContext(), R.layout.databaseview_spinner_item, foldersMergeCursor, 0) { @Override public void bindView(View view, Context context, Cursor cursor) { - // Get a handle for the `Spinner` item `TextView`. + // 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 `TextView` to display the folder name. + // Set the folder icon according to the type. + if (foldersMergeCursor.getPosition() == 0) { // Set the `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)); + } else { // Set a user folder icon. + // Get the folder icon byte array. + 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 folder icon. + spinnerItemImageView.setImageBitmap(folderIconBitmap); + } + + // Set the text view to display the folder name. spinnerItemTextView.setText(cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME))); } }; // Set the `ResourceCursorAdapter` drop drown view resource. - foldersCursorAdapter.setDropDownViewResource(R.layout.edit_bookmark_databaseview_spinner_dropdown_item); + foldersCursorAdapter.setDropDownViewResource(R.layout.databaseview_spinner_dropdown_items); // Set the adapter for the folder `Spinner`. folderSpinner.setAdapter(foldersCursorAdapter); @@ -262,7 +292,7 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { } // Store the current folder database ID. - currentFolderDatabaseId = (int) folderSpinner.getSelectedItemId(); + int currentFolderDatabaseId = (int) folderSpinner.getSelectedItemId(); // Populate the display order `EditText`. displayOrderEditText.setText(String.valueOf(bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)))); @@ -273,7 +303,7 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { // Update the edit button if the icon selection changes. iconRadioGroup.setOnCheckedChangeListener((group, checkedId) -> { // Update the edit button. - updateEditButton(); + updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder); }); // Update the edit button if the bookmark name changes. @@ -291,7 +321,7 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { @Override public void afterTextChanged(Editable s) { // Update the edit button. - updateEditButton(); + updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder); } }); @@ -310,7 +340,7 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { @Override public void afterTextChanged(Editable s) { // Update the edit button. - updateEditButton(); + updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder); } }); @@ -319,7 +349,7 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { // Update the edit button. - updateEditButton(); + updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder); } @Override @@ -343,7 +373,7 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { @Override public void afterTextChanged(Editable s) { // Update the edit button. - updateEditButton(); + updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder); } }); @@ -352,7 +382,7 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { // Save the bookmark if the event is a key-down on the "enter" button. if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled. // Trigger the `Listener` and return the `DialogFragment` to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId); + editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId, favoriteIconBitmap); // Manually dismiss `alertDialog`. alertDialog.dismiss(); @@ -369,7 +399,7 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { // Save the bookmark if the event is a key-down on the "enter" button. if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled. // Trigger the `Listener` and return the `DialogFragment` to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId); + editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId, favoriteIconBitmap); // Manually dismiss the `AlertDialog`. alertDialog.dismiss(); @@ -386,7 +416,7 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { // Save the bookmark if the event is a key-down on the "enter" button. if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled. // Trigger the `Listener` and return the `DialogFragment` to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId); + editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId, favoriteIconBitmap); // Manually dismiss the `AlertDialog`. alertDialog.dismiss(); @@ -402,7 +432,8 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { return alertDialog; } - private void updateEditButton() { + private void updateEditButton(EditText nameEditText, EditText urlEditText, EditText displayOrderEditText, Spinner folderSpinner, RadioButton newIconRadioButton, Button editButton, + String currentBookmarkName, String currentUrl, int currentFolderDatabaseId, int currentDisplayOrder) { // Get the values from the dialog. String newName = nameEditText.getText().toString(); String newUrl = urlEditText.getText().toString(); @@ -422,7 +453,7 @@ public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment { boolean folderChanged = newFolderDatabaseId != currentFolderDatabaseId; // Has the display order changed? - boolean displayOrderChanged = !newDisplayOrder.equals(currentDisplayOrder); + boolean displayOrderChanged = !newDisplayOrder.equals(String.valueOf(currentDisplayOrder)); // Is the display order empty? boolean displayOrderNotEmpty = !newDisplayOrder.isEmpty();