X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkFolderDatabaseViewDialog.java;h=5033ece87bcb22c59b7f234e91727f3979a8ed1e;hp=0fb537b8eb2a05b9dd411e8c59a2ff5be32d238f;hb=ff636c77836983a078f33e60616204518dab61d1;hpb=012e5595c82d6e8d0b8a46f1ef18a02a56341182 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.java index 0fb537b8..5033ece8 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2018 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -31,12 +31,9 @@ import android.database.MergeCursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.widget.ResourceCursorAdapter; -// `AppCompatDialogFragment` is required instead of `DialogFragment` or an error is produced on API <=22. -import android.support.v7.app.AppCompatDialogFragment; import android.text.Editable; import android.text.TextWatcher; +import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.WindowManager; @@ -46,33 +43,31 @@ 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; +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. + import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper; -public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragment { - // Instantiate the constants. +import java.io.ByteArrayOutputStream; + +public class EditBookmarkFolderDatabaseViewDialog 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 folder database view listener. private EditBookmarkFolderDatabaseViewListener editBookmarkFolderDatabaseViewListener; - private BookmarksDatabaseHelper bookmarksDatabaseHelper; - private StringBuilder exceptFolders; - private String currentFolderName; - private int currentParentFolderDatabaseId; - private String currentDisplayOrder; - private RadioButton currentIconRadioButton; - private EditText nameEditText; - private Spinner folderSpinner; - private EditText displayOrderEditText; - private Button editButton; + // The public interface is used to send information back to the parent activity. public interface EditBookmarkFolderDatabaseViewListener { - void onSaveBookmarkFolder(AppCompatDialogFragment dialogFragment, int selectedFolderDatabaseId); + void onSaveBookmarkFolder(DialogFragment dialogFragment, int selectedFolderDatabaseId, Bitmap favoriteIconBitmap); } public void onAttach(Context context) { @@ -83,17 +78,29 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen editBookmarkFolderDatabaseViewListener = (EditBookmarkFolderDatabaseViewListener) context; } - // Store the database ID in the arguments bundle. - public static EditBookmarkFolderDatabaseViewDialog folderDatabaseId(int databaseId) { - // Create a bundle. - Bundle bundle = new Bundle(); - // Store the bookmark database ID in the bundle. - bundle.putInt("Database ID", databaseId); + public static EditBookmarkFolderDatabaseViewDialog folderDatabaseId(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); + + // Convert the byte array output stream to a byte array. + byte[] favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray(); + + // Create an arguments bundle. + Bundle argumentsBundle = new Bundle(); - // Add the bundle to the dialog. + // 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. EditBookmarkFolderDatabaseViewDialog editBookmarkFolderDatabaseViewDialog = new EditBookmarkFolderDatabaseViewDialog(); - editBookmarkFolderDatabaseViewDialog.setArguments(bundle); + + // Add the arguments bundle to the dialog. + editBookmarkFolderDatabaseViewDialog.setArguments(argumentsBundle); // Return the new dialog. return editBookmarkFolderDatabaseViewDialog; @@ -104,17 +111,29 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { - // Remove the incorrect lint warning 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 folderDatabaseId = getArguments().getInt("Database ID"); + int folderDatabaseId = 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 two `nulls` do not specify the database name or a `CursorFactory`. The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`. - bookmarksDatabaseHelper = new BookmarksDatabaseHelper(getContext(), null, null, 0); + // 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 folderCursor = bookmarksDatabaseHelper.getBookmarkCursor(folderDatabaseId); + Cursor folderCursor = bookmarksDatabaseHelper.getBookmark(folderDatabaseId); folderCursor.moveToFirst(); // Use an alert dialog builder to create the alert dialog. @@ -144,7 +163,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen // Set the listener fo the positive button. dialogBuilder.setPositiveButton(R.string.save, (DialogInterface dialog, int which) -> { // Return the `DialogFragment` to the parent activity on save. - editBookmarkFolderDatabaseViewListener.onSaveBookmarkFolder(EditBookmarkFolderDatabaseViewDialog.this, folderDatabaseId); + editBookmarkFolderDatabaseViewListener.onSaveBookmarkFolder(this, folderDatabaseId, favoriteIconBitmap); }); // Create an alert dialog from the alert dialog builder. @@ -158,9 +177,6 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen 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(); @@ -169,15 +185,14 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen RadioGroup iconRadioGroup = alertDialog.findViewById(R.id.edit_folder_icon_radiogroup); ImageView currentIconImageView = alertDialog.findViewById(R.id.edit_folder_current_icon_imageview); ImageView newFavoriteIconImageView = alertDialog.findViewById(R.id.edit_folder_webpage_favorite_icon_imageview); - currentIconRadioButton = alertDialog.findViewById(R.id.edit_folder_current_icon_radiobutton); - nameEditText = alertDialog.findViewById(R.id.edit_folder_name_edittext); - folderSpinner = alertDialog.findViewById(R.id.edit_folder_parent_folder_spinner); - displayOrderEditText = alertDialog.findViewById(R.id.edit_folder_display_order_edittext); - editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); + EditText nameEditText = alertDialog.findViewById(R.id.edit_folder_name_edittext); + Spinner folderSpinner = alertDialog.findViewById(R.id.edit_folder_parent_folder_spinner); + EditText displayOrderEditText = alertDialog.findViewById(R.id.edit_folder_display_order_edittext); + Button editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); // Store the current folder values. - currentFolderName = folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)); - currentDisplayOrder = folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)); + String currentFolderName = folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)); + int currentDisplayOrder = folderCursor.getInt(folderCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)); String parentFolder = folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER)); // Set the database ID. @@ -189,49 +204,64 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen // Convert the byte array to a `Bitmap` beginning at the first byte and ending at the last. Bitmap currentIconBitmap = BitmapFactory.decodeByteArray(currentIconByteArray, 0, currentIconByteArray.length); - // Display `currentIconBitmap` in `edit_bookmark_current_icon`. + // Display the current icon bitmap 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 folder name `EditText`. + // Populate the folder name edit text. nameEditText.setText(currentFolderName); - // 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)}); - // Initialize a `StringBuilder` to track the folders not to display in the `Spinner` and populate it with the current folder. - exceptFolders = new StringBuilder(DatabaseUtils.sqlEscapeString(currentFolderName)); - // Add all subfolders of the current folder to the list of folders not to display. - addSubfoldersToExceptFolders(currentFolderName); + String exceptFolders = getStringOfSubfolders(currentFolderName, bookmarksDatabaseHelper); + + Log.i("Folders", "String of Folders Not To Display: " + exceptFolders); - // Get a `Cursor` with the list of all the folders. - Cursor foldersCursor = bookmarksDatabaseHelper.getFoldersCursorExcept(exceptFolders.toString()); + // Get a cursor with the list of all the folders. + Cursor foldersCursor = bookmarksDatabaseHelper.getFoldersExcept(exceptFolders); - // Combine `matrixCursor` and `foldersCursor`. + // Combine the matrix cursor and the folders cursor. MergeCursor foldersMergeCursor = new MergeCursor(new Cursor[]{matrixCursor, foldersCursor}); // Remove the incorrect lint warning 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 EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen } // Store the current folder database ID. - currentParentFolderDatabaseId = (int) folderSpinner.getSelectedItemId(); + int currentParentFolderDatabaseId = (int) folderSpinner.getSelectedItemId(); // Populate the display order `EditText`. displayOrderEditText.setText(String.valueOf(folderCursor.getInt(folderCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)))); @@ -273,7 +303,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen // Update the edit button if the icon selection changes. iconRadioGroup.setOnCheckedChangeListener((group, checkedId) -> { // Update the edit button. - updateEditButton(); + updateEditButton(alertDialog, bookmarksDatabaseHelper, currentFolderName, currentParentFolderDatabaseId, currentDisplayOrder); }); // Update the edit button if the bookmark name changes. @@ -291,7 +321,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen @Override public void afterTextChanged(Editable s) { // Update the edit button. - updateEditButton(); + updateEditButton(alertDialog, bookmarksDatabaseHelper, currentFolderName, currentParentFolderDatabaseId, currentDisplayOrder); } }); @@ -300,7 +330,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { // Update the edit button. - updateEditButton(); + updateEditButton(alertDialog, bookmarksDatabaseHelper, currentFolderName, currentParentFolderDatabaseId, currentDisplayOrder); } @Override @@ -324,7 +354,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen @Override public void afterTextChanged(Editable s) { // Update the edit button. - updateEditButton(); + updateEditButton(alertDialog, bookmarksDatabaseHelper, currentFolderName, currentParentFolderDatabaseId, currentDisplayOrder); } }); @@ -333,7 +363,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen // 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. - editBookmarkFolderDatabaseViewListener.onSaveBookmarkFolder(EditBookmarkFolderDatabaseViewDialog.this, folderDatabaseId); + editBookmarkFolderDatabaseViewListener.onSaveBookmarkFolder(this, folderDatabaseId, favoriteIconBitmap); // Manually dismiss `alertDialog`. alertDialog.dismiss(); @@ -350,7 +380,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen // 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. - editBookmarkFolderDatabaseViewListener.onSaveBookmarkFolder(EditBookmarkFolderDatabaseViewDialog.this, folderDatabaseId); + editBookmarkFolderDatabaseViewListener.onSaveBookmarkFolder(this, folderDatabaseId, favoriteIconBitmap); // Manually dismiss the `AlertDialog`. alertDialog.dismiss(); @@ -366,14 +396,21 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen return alertDialog; } - private void updateEditButton() { + private void updateEditButton(AlertDialog alertDialog, BookmarksDatabaseHelper bookmarksDatabaseHelper, String currentFolderName, int currentParentFolderDatabaseId, int currentDisplayOrder) { + // Get handles for the views. + EditText nameEditText = alertDialog.findViewById(R.id.edit_folder_name_edittext); + Spinner folderSpinner = alertDialog.findViewById(R.id.edit_folder_parent_folder_spinner); + EditText displayOrderEditText = alertDialog.findViewById(R.id.edit_folder_display_order_edittext); + RadioButton currentIconRadioButton = alertDialog.findViewById(R.id.edit_folder_current_icon_radiobutton); + Button editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); + // Get the values from the dialog. String newFolderName = nameEditText.getText().toString(); int newParentFolderDatabaseId = (int) folderSpinner.getSelectedItemId(); String newDisplayOrder = displayOrderEditText.getText().toString(); // Get a cursor for the new folder name if it exists. - Cursor folderExistsCursor = bookmarksDatabaseHelper.getFolderCursor(newFolderName); + Cursor folderExistsCursor = bookmarksDatabaseHelper.getFolder(newFolderName); // Is the new folder name empty? boolean folderNameNotEmpty = !newFolderName.isEmpty(); @@ -391,7 +428,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen boolean parentFolderChanged = newParentFolderDatabaseId != currentParentFolderDatabaseId; // 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(); @@ -400,23 +437,31 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen editButton.setEnabled((iconChanged || folderRenamed || parentFolderChanged || displayOrderChanged) && folderNameNotEmpty && displayOrderNotEmpty); } - private void addSubfoldersToExceptFolders(String folderName) { - // Get a `Cursor` will all the immediate subfolders. - Cursor subfoldersCursor = bookmarksDatabaseHelper.getSubfoldersCursor(folderName); + private String getStringOfSubfolders(String folderName, BookmarksDatabaseHelper bookmarksDatabaseHelper) { + // Get a cursor will all the immediate subfolders. + Cursor subfoldersCursor = bookmarksDatabaseHelper.getSubfolders(folderName); + + // Initialize a string builder to track the folders not to display in the spinner and populate it with the current folder. + StringBuilder exceptFoldersStringBuilder = new StringBuilder(DatabaseUtils.sqlEscapeString(folderName)); for (int i = 0; i < subfoldersCursor.getCount(); i++) { - // Move `subfolderCursor` to the current item. + // Move the subfolder cursor to the current item. subfoldersCursor.moveToPosition(i); // Get the name of the subfolder. String subfolderName = subfoldersCursor.getString(subfoldersCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)); - // Add the subfolder to `exceptFolders`. - exceptFolders.append(","); - exceptFolders.append(DatabaseUtils.sqlEscapeString(subfolderName)); + // Add a comma to the end of the existing string. + exceptFoldersStringBuilder.append(","); - // Run the same tasks for any subfolders of the subfolder. - addSubfoldersToExceptFolders(subfolderName); + // Get the folder name and run the task for any subfolders. + String subfolderString = getStringOfSubfolders(subfolderName, bookmarksDatabaseHelper); + + // Add the folder name to the string builder. + exceptFoldersStringBuilder.append(subfolderString); } + + // Return the string of folders. + return exceptFoldersStringBuilder.toString(); } } \ No newline at end of file