/*
- * Copyright © 2016-2017 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.dialogs;
import android.annotation.SuppressLint;
-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.database.DatabaseUtils;
import android.database.MatrixCursor;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-// `AppCompatDialogFragment` must be used instead of `DialogFragment` or an error is produced on API <=22.
-import android.support.v7.app.AppCompatDialogFragment;
+import android.preference.PreferenceManager;
import android.view.View;
import android.view.ViewGroup;
+import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.CursorAdapter;
import android.widget.ListView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.DialogFragment;
+
import com.stoutner.privacybrowser.R;
import com.stoutner.privacybrowser.activities.BookmarksActivity;
-import com.stoutner.privacybrowser.activities.MainWebViewActivity;
import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper;
import java.io.ByteArrayOutputStream;
-public class MoveToFolderDialog extends AppCompatDialogFragment {
+public class MoveToFolderDialog extends DialogFragment {
+ // Instantiate the class variables.
+ private MoveToFolderListener moveToFolderListener;
+ private BookmarksDatabaseHelper bookmarksDatabaseHelper;
+ private StringBuilder exceptFolders;
+
// The public interface is used to send information back to the parent activity.
public interface MoveToFolderListener {
- void onMoveToFolder(AppCompatDialogFragment dialogFragment);
+ void onMoveToFolder(DialogFragment dialogFragment);
}
- // `moveToFolderListener` is used in `onAttach()` and `onCreateDialog`.
- private MoveToFolderListener moveToFolderListener;
-
- public void onAttach(Context context) {
+ public void onAttach(@NonNull Context context) {
+ // Run the default commands.
super.onAttach(context);
- // Get a handle for `MoveToFolderListener` from `parentActivity`.
- try {
- moveToFolderListener = (MoveToFolderListener) context;
- } catch(ClassCastException exception) {
- throw new ClassCastException(context.toString() + " must implement EditBookmarkFolderListener.");
- }
+ // Get a handle for `MoveToFolderListener` from the launching context.
+ moveToFolderListener = (MoveToFolderListener) context;
}
- // `exceptFolders` is used in `onCreateDialog()` and `addSubfoldersToExceptFolders()`.
- private String exceptFolders;
-
- // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
+ // `@SuppressLint("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) {
- // Use `AlertDialog.Builder` to create the `AlertDialog`.
- AlertDialog.Builder dialogBuilder;
-
- // Set the style according to the theme.
- if (MainWebViewActivity.darkTheme) {
- dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark);
- } else {
- dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogLight);
- }
+ // Initialize the database helper. 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);
+
+ // Use an alert dialog builder to create the alert dialog.
+ AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog);
// Set the title.
dialogBuilder.setTitle(R.string.move_to_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.move_to_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.move, new Dialog.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- // Return the `DialogFragment` to the parent activity on save.
- moveToFolderListener.onMoveToFolder(MoveToFolderDialog.this);
- }
+ // Set the listener fo the positive button.
+ dialogBuilder.setPositiveButton(R.string.move, (DialogInterface dialog, int which) -> {
+ // Return the `DialogFragment` to the parent activity on save.
+ moveToFolderListener.onMoveToFolder(MoveToFolderDialog.this);
});
- // Create an `AlertDialog` from the `AlertDialog.Builder`.
+ // Create an alert dialog from the alert dialog builder.
final AlertDialog alertDialog = dialogBuilder.create();
- // Show the `AlertDialog` so the items in the layout can be modified.
+ // Get a handle for the shared preferences.
+ SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+
+ // Get the screenshot preference.
+ boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false);
+
+ // Disable screenshots if not allowed.
+ if (!allowScreenshots) {
+ // Remove the warning below that `getWindow()` might be null.
+ assert alertDialog.getWindow() != null;
+
+ // Disable screenshots.
+ alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+ }
+
+ // Show the alert dialog so the items in the layout can be modified.
alertDialog.show();
// Get a handle for the positive button.
// Initially disable the positive button.
moveButton.setEnabled(false);
- // Initialize the `Cursor` and `CursorAdapter` variables.
+ // Initialize the variables.
Cursor foldersCursor;
CursorAdapter foldersCursorAdapter;
+ exceptFolders = new StringBuilder();
// Check to see if we are in the `Home Folder`.
if (BookmarksActivity.currentFolder.isEmpty()) { // Don't display `Home Folder` at the top of the `ListView`.
- // Initialize `exceptFolders`.
- exceptFolders = "";
-
// If a folder is selected, add it and all children to the list of folders not to display.
long[] selectedBookmarksLongArray = BookmarksActivity.checkedItemIds;
for (long databaseIdLong : selectedBookmarksLongArray) {
int databaseIdInt = (int) databaseIdLong;
// If `databaseIdInt` is a folder.
- if (BookmarksActivity.bookmarksDatabaseHelper.isFolder(databaseIdInt)) {
+ if (bookmarksDatabaseHelper.isFolder(databaseIdInt)) {
// Get the name of the selected folder.
- String folderName = BookmarksActivity.bookmarksDatabaseHelper.getFolderName(databaseIdInt);
+ String folderName = bookmarksDatabaseHelper.getFolderName(databaseIdInt);
- if (exceptFolders.isEmpty()){
+ // Populate the list of folders not to get.
+ if (exceptFolders.toString().isEmpty()){
// Add the selected folder to the list of folders not to display.
- exceptFolders = DatabaseUtils.sqlEscapeString(folderName);
+ exceptFolders.append(DatabaseUtils.sqlEscapeString(folderName));
} else {
// Add the selected folder to the end of the list of folders not to display.
- exceptFolders = exceptFolders + "," + DatabaseUtils.sqlEscapeString(folderName);
+ exceptFolders.append(",");
+ exceptFolders.append(DatabaseUtils.sqlEscapeString(folderName));
}
// Add the selected folder's subfolders to the list of folders not to display.
}
}
- // Get a `Cursor` containing the folders to display.
- foldersCursor = BookmarksActivity.bookmarksDatabaseHelper.getFoldersCursorExcept(exceptFolders);
+ // Get a cursor containing the folders to display.
+ foldersCursor = bookmarksDatabaseHelper.getFoldersExcept(exceptFolders.toString());
// Setup `foldersCursorAdaptor` with `this` context. `false` disables autoRequery.
foldersCursorAdapter = new CursorAdapter(alertDialog.getContext(), foldersCursor, false) {
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
+ // Remove the incorrect lint warning that `.getLayoutInflater()` might be false.
+ assert getActivity() != null;
+
// Inflate the individual item layout. `false` does not attach it to the root.
return getActivity().getLayoutInflater().inflate(R.layout.move_to_folder_item_linearlayout, parent, false);
}
// 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);
// Display `folderIconBitmap` in `move_to_folder_icon`.
- ImageView folderIconImageView = (ImageView) view.findViewById(R.id.move_to_folder_icon);
+ ImageView folderIconImageView = view.findViewById(R.id.move_to_folder_icon);
folderIconImageView.setImageBitmap(folderIconBitmap);
// Get the folder name from `cursor` and display it in `move_to_folder_name_textview`.
String folderName = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME));
- TextView folderNameTextView = (TextView) view.findViewById(R.id.move_to_folder_name_textview);
+ TextView folderNameTextView = view.findViewById(R.id.move_to_folder_name_textview);
folderNameTextView.setText(folderName);
}
};
} else { // Display `Home Folder` at the top of the `ListView`.
- // Get the home folder icon drawable and convert it to a `Bitmap`. `this` specifies the current context.
+ // Get the home folder icon drawable and convert it to a `Bitmap`.
Drawable homeFolderIconDrawable = ContextCompat.getDrawable(getActivity().getApplicationContext(), R.drawable.folder_gray_bitmap);
BitmapDrawable homeFolderIconBitmapDrawable = (BitmapDrawable) homeFolderIconDrawable;
+ assert homeFolderIconDrawable != null;
Bitmap homeFolderIconBitmap = homeFolderIconBitmapDrawable.getBitmap();
+
// Convert the folder `Bitmap` to a byte array. `0` is for lossless compression (the only option for a PNG).
ByteArrayOutputStream homeFolderIconByteArrayOutputStream = new ByteArrayOutputStream();
homeFolderIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, homeFolderIconByteArrayOutputStream);
homeFolderMatrixCursor.addRow(new Object[]{0, getString(R.string.home_folder), homeFolderIconByteArray});
// Add the parent folder to the list of folders not to display.
- exceptFolders = DatabaseUtils.sqlEscapeString(BookmarksActivity.currentFolder);
+ exceptFolders.append(DatabaseUtils.sqlEscapeString(BookmarksActivity.currentFolder));
// If a folder is selected, add it and all children to the list of folders not to display.
long[] selectedBookmarksLongArray = BookmarksActivity.checkedItemIds;
int databaseIdInt = (int) databaseIdLong;
// If `databaseIdInt` is a folder.
- if (BookmarksActivity.bookmarksDatabaseHelper.isFolder(databaseIdInt)) {
+ if (bookmarksDatabaseHelper.isFolder(databaseIdInt)) {
// Get the name of the selected folder.
- String folderName = BookmarksActivity.bookmarksDatabaseHelper.getFolderName(databaseIdInt);
+ String folderName = bookmarksDatabaseHelper.getFolderName(databaseIdInt);
// Add the selected folder to the end of the list of folders not to display.
- exceptFolders = exceptFolders + "," + DatabaseUtils.sqlEscapeString(folderName);
+ exceptFolders.append(",");
+ exceptFolders.append(DatabaseUtils.sqlEscapeString(folderName));
// Add the selected folder's subfolders to the list of folders not to display.
addSubfoldersToExceptFolders(folderName);
}
// Get a `Cursor` containing the folders to display.
- foldersCursor = BookmarksActivity.bookmarksDatabaseHelper.getFoldersCursorExcept(exceptFolders);
+ foldersCursor = bookmarksDatabaseHelper.getFoldersExcept(exceptFolders.toString());
// Combine `homeFolderMatrixCursor` and `foldersCursor`.
MergeCursor foldersMergeCursor = new MergeCursor(new Cursor[]{homeFolderMatrixCursor, foldersCursor});
foldersCursorAdapter = new CursorAdapter(alertDialog.getContext(), foldersMergeCursor, false) {
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
+ // Remove the incorrect lint warning that `.getLayoutInflater()` might be false.
+ assert getActivity() != null;
+
// Inflate the individual item layout. `false` does not attach it to the root.
return getActivity().getLayoutInflater().inflate(R.layout.move_to_folder_item_linearlayout, parent, false);
}
// 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);
// Display `folderIconBitmap` in `move_to_folder_icon`.
- ImageView folderIconImageView = (ImageView) view.findViewById(R.id.move_to_folder_icon);
+ ImageView folderIconImageView = view.findViewById(R.id.move_to_folder_icon);
folderIconImageView.setImageBitmap(folderIconBitmap);
// Get the folder name from `cursor` and display it in `move_to_folder_name_textview`.
String folderName = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME));
- TextView folderNameTextView = (TextView) view.findViewById(R.id.move_to_folder_name_textview);
+ TextView folderNameTextView = view.findViewById(R.id.move_to_folder_name_textview);
folderNameTextView.setText(folderName);
}
};
}
- // Display the ListView
- ListView foldersListView = (ListView) alertDialog.findViewById(R.id.move_to_folder_listview);
+ // Get a handle for the folders list view.
+ ListView foldersListView = alertDialog.findViewById(R.id.move_to_folder_listview);
+
+ // Remove the incorrect lint warning below that the view might be null.
+ assert foldersListView != null;
+
+ // Set the folder list view adapter.
foldersListView.setAdapter(foldersCursorAdapter);
// Enable the move button when a folder is selected.
- foldersListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
- @Override
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- // Enable the move button.
- moveButton.setEnabled(true);
- }
+ foldersListView.setOnItemClickListener((AdapterView<?> parent, View view, int position, long id) -> {
+ // Enable the move button.
+ moveButton.setEnabled(true);
});
// `onCreateDialog` requires the return of an `AlertDialog`.
private void addSubfoldersToExceptFolders(String folderName) {
// Get a `Cursor` will all the immediate subfolders.
- Cursor subfoldersCursor = BookmarksActivity.bookmarksDatabaseHelper.getSubfoldersCursor(folderName);
+ Cursor subfoldersCursor = bookmarksDatabaseHelper.getSubfolders(folderName);
for (int i = 0; i < subfoldersCursor.getCount(); i++) {
// Move `subfolderCursor` to the current item.
// 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));
+
// Run the same tasks for any subfolders of the subfolder.
addSubfoldersToExceptFolders(subfolderName);
-
- // Add the subfolder to `exceptFolders`.
- subfolderName = DatabaseUtils.sqlEscapeString(subfolderName);
- exceptFolders = exceptFolders + "," + subfolderName;
}
-
}
-}
+}
\ No newline at end of file
projects / PrivacyBrowserAndroid.git / blobdiff