X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkDialog.java;h=adf6d44e39946801f741f205436f889efd1b49f5;hp=ab3a8a3b0689c8e44c1160ed9aa15693c7de08b2;hb=ca7516a7edb9e06d0f9fe9186513986cd82be716;hpb=b4d6f15dc8bb99285a1f675782c9d29d6000e33e diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.java index ab3a8a3b..adf6d44e 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -24,14 +24,12 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; +import android.content.SharedPreferences; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -// We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <=22. -import android.support.v7.app.AppCompatDialogFragment; +import android.preference.PreferenceManager; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -43,57 +41,101 @@ import android.widget.ImageView; import android.widget.RadioButton; import android.widget.RadioGroup; -import com.stoutner.privacybrowser.activities.BookmarksActivity; -import com.stoutner.privacybrowser.activities.MainWebViewActivity; +import androidx.annotation.NonNull; +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.helpers.BookmarksDatabaseHelper; -public class EditBookmarkDialog extends AppCompatDialogFragment { +import java.io.ByteArrayOutputStream; + +public class EditBookmarkDialog extends DialogFragment { + // Define the edit bookmark listener. + private EditBookmarkListener editBookmarkListener; + // The public interface is used to send information back to the parent activity. public interface EditBookmarkListener { - void onSaveEditBookmark(AppCompatDialogFragment dialogFragment); + void onSaveBookmark(DialogFragment dialogFragment, int selectedBookmarkDatabaseId, Bitmap favoriteIconBitmap); } - // `editBookmarkListener` is used in `onAttach()` and `onCreateDialog()` - private EditBookmarkListener editBookmarkListener; - - public void onAttach(Context context) { + public void onAttach(@NonNull Context context) { + // Run the default commands. super.onAttach(context); - // Get a handle for `EditBookmarkListener` from `context`. - try { - editBookmarkListener = (EditBookmarkListener) context; - } catch(ClassCastException exception) { - throw new ClassCastException(context.toString() + " must implement EditBookmarkListener."); - } + // Get a handle for `EditBookmarkListener` from the launching context. + editBookmarkListener = (EditBookmarkListener) context; } - // Instantiate the class variables. - EditText nameEditText; - EditText urlEditText; - RadioButton newIconRadioButton; - Button editButton; - String currentName; - String currentUrl; + // Store the database ID in the arguments bundle. + public static EditBookmarkDialog 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); + + // 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. + EditBookmarkDialog editBookmarkDialog = new EditBookmarkDialog(); + + // Add the arguments bundle to the dialog. + editBookmarkDialog.setArguments(argumentsBundle); + + // Return the new dialog. + return editBookmarkDialog; + } // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`. @SuppressLint("InflateParams") @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { - // Get a long array with the the databaseId of the selected bookmark and convert it to an `int`. - long[] selectedBookmarkLongArray = BookmarksActivity.checkedItemIds; - int selectedBookmarkDatabaseId = (int) selectedBookmarkLongArray[0]; + // Get the arguments. + Bundle arguments = getArguments(); + + // Remove the incorrect lint warning below that the arguments might be null. + assert arguments != null; + + // Store the bookmark database ID in the class variable. + int selectedBookmarkDatabaseId = arguments.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; - // Get a `Cursor` with the specified bookmark and move it to the first position. - Cursor bookmarkCursor = BookmarksActivity.bookmarksDatabaseHelper.getBookmarkCursor(selectedBookmarkDatabaseId); + // 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.getBookmark(selectedBookmarkDatabaseId); bookmarkCursor.moveToFirst(); - // Use `AlertDialog.Builder` to create the `AlertDialog`. + // Use an alert dialog builder to create the alert dialog. AlertDialog.Builder dialogBuilder; + // Get a handle for the shared preferences. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext()); + + // Get the screenshot and theme preferences. + boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); + boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + // Set the style according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark); } else { dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogLight); @@ -102,64 +144,62 @@ public class EditBookmarkDialog extends AppCompatDialogFragment { // Set the title. dialogBuilder.setTitle(R.string.edit_bookmark); - // Set the view. The parent view is `null` because it will be assigned by `AlertDialog`. + // Remove the incorrect lint warning that `getActivity().getLayoutInflater()` might be null. + assert getActivity() != null; + + // Set the view. The parent view is null because it will be assigned by the alert dialog. dialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.edit_bookmark_dialog, null)); - // Set an `onClick()` listener for the negative button. - dialogBuilder.setNegativeButton(R.string.cancel, new Dialog.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Do nothing. The `AlertDialog` will close automatically. - } + // Set the cancel button listener. + dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> { + // Do nothing. The alert dialog will close automatically. }); - // Set the `onClick()` listener fo the positive button. - dialogBuilder.setPositiveButton(R.string.save, new Dialog.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Return the `DialogFragment` to the parent activity on save. - editBookmarkListener.onSaveEditBookmark(EditBookmarkDialog.this); - } + // Set the save button listener. + dialogBuilder.setPositiveButton(R.string.save, (DialogInterface dialog, int which) -> { + // Return the dialog fragment to the parent activity. + editBookmarkListener.onSaveBookmark(this, selectedBookmarkDatabaseId, favoriteIconBitmap); }); - // Create an `AlertDialog` from the `AlertDialog.Builder`. + // Create an alert dialog from the builder. final AlertDialog alertDialog = dialogBuilder.create(); - // Remove the warning below that `setSoftInputMode` might produce `java.lang.NullPointerException`. + // remove the incorrect lint warning below that `getWindow().addFlags()` might be null. assert alertDialog.getWindow() != null; - // Show the keyboard when `alertDialog` is displayed on the screen. - alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); + // Disable screenshots if not allowed. + if (!allowScreenshots) { + alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); + } - // The `AlertDialog` must be shown before items in the layout can be modified. + // The alert dialog must be shown before items in the layout can be modified. alertDialog.show(); // Get handles for the layout items. - RadioGroup iconRadioGroup = (RadioGroup) alertDialog.findViewById(R.id.edit_bookmark_icon_radiogroup); - ImageView currentIconImageView = (ImageView) alertDialog.findViewById(R.id.edit_bookmark_current_icon); - ImageView newFavoriteIconImageView = (ImageView) alertDialog.findViewById(R.id.edit_bookmark_web_page_favorite_icon); - newIconRadioButton = (RadioButton) alertDialog.findViewById(R.id.edit_bookmark_web_page_favorite_icon_radiobutton); - nameEditText = (EditText) alertDialog.findViewById(R.id.edit_bookmark_name_edittext); - urlEditText = (EditText) alertDialog.findViewById(R.id.edit_bookmark_url_edittext); - editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); - - // Get the current favorite icon byte array from the `Cursor`. + 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); + EditText nameEditText = alertDialog.findViewById(R.id.edit_bookmark_name_edittext); + EditText urlEditText = alertDialog.findViewById(R.id.edit_bookmark_url_edittext); + Button editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); + + // Get the current favorite icon byte array from the cursor. byte[] currentIconByteArray = bookmarkCursor.getBlob(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON)); - // Convert the byte array to a `Bitmap` beginning at the first byte and ending at the last. + // 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. 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); // Store the current bookmark name and URL. - currentName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)); - currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL)); + String currentName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)); + String currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL)); - // Populate the `EditTexts`. + // Populate the edit texts. nameEditText.setText(currentName); urlEditText.setText(currentUrl); @@ -167,12 +207,9 @@ public class EditBookmarkDialog extends AppCompatDialogFragment { editButton.setEnabled(false); // Update the edit button if the icon selection changes. - iconRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) { - // Update the edit button. - updateEditButton(); - } + iconRadioGroup.setOnCheckedChangeListener((RadioGroup group, int checkedId) -> { + // Update the edit button. + updateEditButton(alertDialog, currentName, currentUrl); }); // Update the edit button if the bookmark name changes. @@ -190,7 +227,7 @@ public class EditBookmarkDialog extends AppCompatDialogFragment { @Override public void afterTextChanged(Editable s) { // Update the edit button. - updateEditButton(); + updateEditButton(alertDialog, currentName, currentUrl); } }); @@ -209,51 +246,56 @@ public class EditBookmarkDialog extends AppCompatDialogFragment { @Override public void afterTextChanged(Editable s) { // Update the edit button. - updateEditButton(); + updateEditButton(alertDialog, currentName, currentUrl); } }); - // Allow the `enter` key on the keyboard to save the bookmark from `edit_bookmark_name_edittext`. - nameEditText.setOnKeyListener(new View.OnKeyListener() { - @Override - public boolean onKey(View v, int keyCode, KeyEvent event) { - // If the event is an `ACTION_DOWN` on the `enter` key, save the bookmark. - if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled. - // Trigger `onSaveEditBookmark()` and return the `DialogFragment` to the parent activity. - editBookmarkListener.onSaveEditBookmark(EditBookmarkDialog.this); - // Manually dismiss `alertDialog`. - alertDialog.dismiss(); - // Consume the event. - return true; - } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. - return false; - } + // Allow the enter key on the keyboard to save the bookmark from the bookmark name edit text. + nameEditText.setOnKeyListener((View v, int keyCode, KeyEvent event) -> { + // 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. + editBookmarkListener.onSaveBookmark(this, selectedBookmarkDatabaseId, favoriteIconBitmap); + + // Manually dismiss `alertDialog`. + alertDialog.dismiss(); + + // Consume the event. + return true; + } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. + return false; } }); - // Allow the "enter" key on the keyboard to save the bookmark from `edit_bookmark_url_edittext`. - urlEditText.setOnKeyListener(new View.OnKeyListener() { - public boolean onKey(View v, int keyCode, KeyEvent event) { - // If the event is a key-down on the `enter` button, select the PositiveButton `Save`. - if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled. - // Trigger `editBookmarkListener` and return the DialogFragment to the parent activity. - editBookmarkListener.onSaveEditBookmark(EditBookmarkDialog.this); - // Manually dismiss the `AlertDialog`. - alertDialog.dismiss(); - // Consume the event. - return true; - } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. - return false; - } + // Allow the enter key on the keyboard to save the bookmark from the URL edit text. + urlEditText.setOnKeyListener((View v, int keyCode, KeyEvent event) -> { + // 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. + editBookmarkListener.onSaveBookmark(this, selectedBookmarkDatabaseId, favoriteIconBitmap); + + // Manually dismiss the alert dialog. + alertDialog.dismiss(); + + // Consume the event. + return true; + } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. + return false; } }); - // `onCreateDialog` requires the return of an `AlertDialog`. + // Return the alert dialog. return alertDialog; } - private void updateEditButton() { - // Get the text from the `EditTexts`. + private void updateEditButton(AlertDialog alertdialog, String currentName, String currentUrl) { + // Get handles for the views. + EditText nameEditText = alertdialog.findViewById(R.id.edit_bookmark_name_edittext); + EditText urlEditText = alertdialog.findViewById(R.id.edit_bookmark_url_edittext); + RadioButton newIconRadioButton = alertdialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon_radiobutton); + Button editButton = alertdialog.getButton(AlertDialog.BUTTON_POSITIVE); + + // Get the text from the edit texts. String newName = nameEditText.getText().toString(); String newUrl = urlEditText.getText().toString(); @@ -266,6 +308,7 @@ public class EditBookmarkDialog extends AppCompatDialogFragment { // Has the URL changed? boolean urlChanged = !newUrl.equals(currentUrl); + // Update the enabled status of the edit button. editButton.setEnabled(iconChanged || nameChanged || urlChanged); } } \ No newline at end of file