/*
- * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
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.
+// `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.widget.RadioButton;
import android.widget.RadioGroup;
-import com.stoutner.privacybrowser.activities.BookmarksActivity;
-import com.stoutner.privacybrowser.activities.MainWebViewActivity;
import com.stoutner.privacybrowser.R;
+import com.stoutner.privacybrowser.activities.MainWebViewActivity;
import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper;
public class EditBookmarkFolderDialog extends AppCompatDialogFragment {
+ // Instantiate the class variable.
+ private EditBookmarkFolderListener editBookmarkFolderListener;
+
// The public interface is used to send information back to the parent activity.
public interface EditBookmarkFolderListener {
- void onEditBookmarkFolder(AppCompatDialogFragment dialogFragment);
+ void onSaveBookmarkFolder(AppCompatDialogFragment dialogFragment, int selectedFolderDatabaseId);
}
- // `editFolderListener` is used in `onAttach()` and `onCreateDialog`.
- private EditBookmarkFolderListener editBookmarkFolderListener;
-
public void onAttach(Context context) {
+ // Run the default commands.
super.onAttach(context);
- // Get a handle for `EditFolderListener` from `parentActivity`.
- try {
- editBookmarkFolderListener = (EditBookmarkFolderListener) context;
- } catch(ClassCastException exception) {
- throw new ClassCastException(context.toString() + " must implement EditBookmarkFolderListener.");
- }
+ // Get a handle for `EditFolderListener` from the launching context.
+ editBookmarkFolderListener = (EditBookmarkFolderListener) context;
+ }
+
+ // Store the database ID in the arguments bundle.
+ public static EditBookmarkFolderDialog folderDatabaseId(int databaseId) {
+ // Create a bundle
+ Bundle bundle = new Bundle();
+
+ // Store the folder database ID in the bundle.
+ bundle.putInt("Database ID", databaseId);
+
+ // Add the bundle to the dialog.
+ EditBookmarkFolderDialog editBookmarkFolderDialog = new EditBookmarkFolderDialog();
+ editBookmarkFolderDialog.setArguments(bundle);
+
+ // Return the new dialog.
+ return editBookmarkFolderDialog;
}
// `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
@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];
+ // Remove the incorrect lint warning that `getInt()` might be null.
+ assert getArguments() != null;
+
+ // Store the folder database ID in the class variable.
+ int selectedFolderDatabaseId = getArguments().getInt("Database ID");
- // Get a `Cursor` with the specified bookmark and move it to the first position.
- Cursor bookmarkCursor = BookmarksActivity.bookmarksDatabaseHelper.getBookmarkCursor(selectedBookmarkDatabaseId);
- bookmarkCursor.moveToFirst();
+ // 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`.
+ final BookmarksDatabaseHelper bookmarksDatabaseHelper = new BookmarksDatabaseHelper(getContext(), null, null, 0);
- // Use `AlertDialog.Builder` to create the `AlertDialog`.
+ // Get a `Cursor` with the selected folder and move it to the first position.
+ Cursor folderCursor = bookmarksDatabaseHelper.getBookmark(selectedFolderDatabaseId);
+ folderCursor.moveToFirst();
+
+ // Use an alert dialog builder to create the alert dialog.
AlertDialog.Builder dialogBuilder;
// Set the style according to the theme.
// Set the title.
dialogBuilder.setTitle(R.string.edit_folder);
+ // Remove the incorrect lint warning that `getActivity()` might be null.
+ assert getActivity() != null;
+
// Set the view. The parent view is `null` because it will be assigned by `AlertDialog`.
dialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.edit_bookmark_folder_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 listener for the negative button.
+ dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> {
+ // Do nothing. The `AlertDialog` 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.
- editBookmarkFolderListener.onEditBookmarkFolder(EditBookmarkFolderDialog.this);
- }
+ // 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.
+ editBookmarkFolderListener.onSaveBookmarkFolder(EditBookmarkFolderDialog.this, selectedFolderDatabaseId);
});
-
- // Create an `AlertDialog` from the `AlertDialog.Builder`.
+ // Create an alert dialog from the alert dialog builder.
final AlertDialog alertDialog = dialogBuilder.create();
- // Remove the warning below that `setSoftInputMode` might produce `java.lang.NullPointerException`.
+ // Remove the warning below that `getWindow()` might be null.
assert alertDialog.getWindow() != null;
- // Show the keyboard when the `Dialog` is displayed on the screen.
+ // Disable screenshots if not allowed.
+ if (!MainWebViewActivity.allowScreenshots) {
+ alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+ }
+
+ // Show the keyboard when the dialog is displayed on the screen.
alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
- // 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 layout items in the `AlertDialog`.
final Button editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
- final RadioButton currentIconRadioButton = (RadioButton) alertDialog.findViewById(R.id.edit_folder_current_icon_radiobutton);
- RadioGroup iconRadioGroup = (RadioGroup) alertDialog.findViewById(R.id.edit_folder_icon_radio_group);
+ final RadioButton currentIconRadioButton = alertDialog.findViewById(R.id.edit_folder_current_icon_radiobutton);
+ RadioGroup iconRadioGroup = alertDialog.findViewById(R.id.edit_folder_icon_radio_group);
// Initially disable the edit button.
editButton.setEnabled(false);
// Get the current favorite icon byte array from the `Cursor`.
- byte[] currentIconByteArray = bookmarkCursor.getBlob(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON));
+ byte[] currentIconByteArray = folderCursor.getBlob(folderCursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON));
// 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_folder_current_icon`.
- ImageView currentIconImageView = (ImageView) alertDialog.findViewById(R.id.edit_folder_current_icon);
+ ImageView currentIconImageView = alertDialog.findViewById(R.id.edit_folder_current_icon_imageview);
currentIconImageView.setImageBitmap(currentIconBitmap);
// Get a `Bitmap` of the favorite icon from `MainWebViewActivity` and display it in `edit_folder_web_page_favorite_icon`.
- ImageView webPageFavoriteIconImageView = (ImageView) alertDialog.findViewById(R.id.edit_folder_web_page_favorite_icon);
+ ImageView webPageFavoriteIconImageView = alertDialog.findViewById(R.id.edit_folder_web_page_favorite_icon_imageview);
webPageFavoriteIconImageView.setImageBitmap(MainWebViewActivity.favoriteIconBitmap);
// Get the current folder name.
- final String currentFolderName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME));
+ final String currentFolderName = folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME));
// Display the current folder name in `edit_folder_name_edittext`.
- final EditText folderNameEditText = (EditText) alertDialog.findViewById(R.id.edit_folder_name_edittext);
+ final EditText folderNameEditText = alertDialog.findViewById(R.id.edit_folder_name_edittext);
folderNameEditText.setText(currentFolderName);
// Update the status of the edit button when the folder name is changed.
String newFolderName = s.toString();
// Get a cursor for the new folder name if it exists.
- Cursor folderExistsCursor = BookmarksActivity.bookmarksDatabaseHelper.getFolderCursor(newFolderName);
+ Cursor folderExistsCursor = bookmarksDatabaseHelper.getFolder(newFolderName);
// Is the new folder name empty?
- boolean folderNameEmpty = newFolderName.isEmpty();
+ boolean folderNameNotEmpty = !newFolderName.isEmpty();
// Does the folder name already exist?
boolean folderNameAlreadyExists = (!newFolderName.equals(currentFolderName) && (folderExistsCursor.getCount() > 0));
boolean iconChanged = (!currentIconRadioButton.isChecked() && !folderNameAlreadyExists);
// Enable the create button if something has been edited and the new folder name is valid.
- editButton.setEnabled(!folderNameEmpty && (folderRenamed || iconChanged));
+ editButton.setEnabled(folderNameNotEmpty && (folderRenamed || iconChanged));
}
});
// Update the status of the edit button when the icon is changed.
- iconRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
- // Get the new folder name.
- String newFolderName = folderNameEditText.getText().toString();
+ iconRadioGroup.setOnCheckedChangeListener((RadioGroup group, int checkedId) -> {
+ // Get the new folder name.
+ String newFolderName = folderNameEditText.getText().toString();
- // Get a cursor for the new folder name if it exists.
- Cursor folderExistsCursor = BookmarksActivity.bookmarksDatabaseHelper.getFolderCursor(newFolderName);
+ // Get a cursor for the new folder name if it exists.
+ Cursor folderExistsCursor = bookmarksDatabaseHelper.getFolder(newFolderName);
- // Is the new folder name empty?
- boolean folderNameEmpty = newFolderName.isEmpty();
+ // Is the new folder name empty?
+ boolean folderNameEmpty = newFolderName.isEmpty();
- // Does the folder name already exist?
- boolean folderNameAlreadyExists = (!newFolderName.equals(currentFolderName) && (folderExistsCursor.getCount() > 0));
+ // Does the folder name already exist?
+ boolean folderNameAlreadyExists = (!newFolderName.equals(currentFolderName) && (folderExistsCursor.getCount() > 0));
- // Has the folder been renamed?
- boolean folderRenamed = (!newFolderName.equals(currentFolderName) && !folderNameAlreadyExists);
+ // Has the folder been renamed?
+ boolean folderRenamed = (!newFolderName.equals(currentFolderName) && !folderNameAlreadyExists);
- // Has the favorite icon changed?
- boolean iconChanged = (!currentIconRadioButton.isChecked() && !folderNameAlreadyExists);
+ // Has the favorite icon changed?
+ boolean iconChanged = (!currentIconRadioButton.isChecked() && !folderNameAlreadyExists);
- // Enable the create button if something has been edited and the new folder name is valid.
- editButton.setEnabled(!folderNameEmpty && (folderRenamed || iconChanged));
- }
+ // Enable the create button if something has been edited and the new folder name is valid.
+ editButton.setEnabled(!folderNameEmpty && (folderRenamed || iconChanged));
});
// Allow the `enter` key on the keyboard to save the bookmark from `edit_bookmark_name_edittext`.
- folderNameEditText.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.
- editBookmarkFolderListener.onEditBookmarkFolder(EditBookmarkFolderDialog.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;
- }
+ folderNameEditText.setOnKeyListener((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.
+ editBookmarkFolderListener.onSaveBookmarkFolder(EditBookmarkFolderDialog.this, selectedFolderDatabaseId);
+
+ // 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;
}
});
projects / PrivacyBrowserAndroid.git / blobdiff