import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
-import android.database.DatabaseUtils;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Typeface;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v4.app.NavUtils;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.CursorAdapter;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.ViewGroup;
import android.widget.AbsListView;
import android.widget.AdapterView;
-import android.widget.CheckBox;
+import android.widget.CursorAdapter;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ListView;
public class BookmarksActivity extends AppCompatActivity implements CreateBookmark.CreateBookmarkListener,
CreateBookmarkFolder.CreateBookmarkFolderListener, EditBookmark.EditBookmarkListener,
- EditBookmarkFolder.EditBookmarkFolderListener {
- // `bookmarksDatabaseHandler` is public static so it can be accessed from EditBookmark. It is also used in `onCreate()`,
+ EditBookmarkFolder.EditBookmarkFolderListener, MoveToFolder.MoveToFolderListener {
+ // `bookmarksDatabaseHandler` is public static so it can be accessed from `EditBookmark` and `MoveToFolder`. It is also used in `onCreate()`,
// `onCreateBookmarkCreate()`, `updateBookmarksListView()`, and `updateBookmarksListViewExcept()`.
public static BookmarksDatabaseHandler bookmarksDatabaseHandler;
- // `bookmarksListView` is public static so it can be accessed from EditBookmark.
+ // `bookmarksListView` is public static so it can be accessed from `EditBookmark`.
// It is also used in `onCreate()`, `updateBookmarksListView()`, and `updateBookmarksListViewExcept()`.
public static ListView bookmarksListView;
- // `currentFolder` is used in `onCreate`, `onOptionsItemSelected()`, `onCreateBookmarkCreate`, `onCreateBookmarkFolderCreate`, and `onEditBookmarkSave`.
- private String currentFolder;
+ // `currentFolder` is public static so it can be accessed from `MoveToFolder`.
+ // It is used in `onCreate`, `onOptionsItemSelected()`, `onCreateBookmarkCreate`, `onCreateBookmarkFolderCreate`, and `onEditBookmarkSave`.
+ public static String currentFolder;
// `contextualActionMode` is used in `onCreate()` and `onEditBookmarkSave()`.
private ActionMode contextualActionMode;
MainWebViewActivity.formattedUrlString = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHandler.BOOKMARK_URL));
// Load formattedUrlString and return to the main activity.
- MainWebViewActivity.mainWebView.loadUrl(MainWebViewActivity.formattedUrlString);
+ MainWebViewActivity.mainWebView.loadUrl(MainWebViewActivity.formattedUrlString, MainWebViewActivity.customHeaders);
NavUtils.navigateUpFromSameTask(bookmarksActivity);
}
editBookmarkMenuItem = menu.findItem(R.id.edit_bookmark);
selectAllBookmarksMenuItem = menu.findItem(R.id.context_menu_select_all_bookmarks);
+ // Get a handle for `contextualActionMode` so we can close it programatically.
+ contextualActionMode = mode;
+
return true;
}
// Calculate the number of selected bookmarks.
int numberOfSelectedBookmarks = selectedBookmarksLongArray.length;
+ // Sometimes Android forgets to close the contextual app bar when all the items are deselected.
+ if (numberOfSelectedBookmarks == 0) {
+ mode.finish();
+ }
+
// List the number of selected bookmarks in the subtitle.
mode.setSubtitle(numberOfSelectedBookmarks + " " + getString(R.string.selected));
bookmarksListView.setSelection(selectedBookmarkNewPosition - 5);
break;
- case R.id.edit_bookmark:
- // Get a handle for `contextualActionMode` so we can close it when `editBookmarkDialog` is finished.
- contextualActionMode = mode;
+ case R.id.move_to_folder:
+ // Show the `MoveToFolder` `AlertDialog` and name the instance `@string/move_to_folder
+ DialogFragment moveToFolderDialog = new MoveToFolder();
+ moveToFolderDialog.show(getFragmentManager(), getResources().getString(R.string.move_to_folder));
+ break;
+ case R.id.edit_bookmark:
// Get a handle for `selectedBookmarkPosition` so we can scroll to it after refreshing the ListView.
bookmarkPositionSparseBooleanArray = bookmarksListView.getCheckedItemPositions();
- selectedBookmarkPosition = bookmarkPositionSparseBooleanArray.keyAt(0);
+ for (int i = 0; i < bookmarkPositionSparseBooleanArray.size(); i++) {
+ // Find the bookmark that is selected and save the position to `selectedBookmarkPosition`.
+ if (bookmarkPositionSparseBooleanArray.valueAt(i))
+ selectedBookmarkPosition = bookmarkPositionSparseBooleanArray.keyAt(i);
+ }
// Move to the selected database ID and find out if it is a folder.
bookmarksCursor.moveToPosition(selectedBookmarkPosition);
// Get a handle for `selectedBookmarkPosition` so we can scroll to it after refreshing the ListView.
bookmarkPositionSparseBooleanArray = bookmarksListView.getCheckedItemPositions();
- selectedBookmarkPosition = bookmarkPositionSparseBooleanArray.keyAt(0);
+ for (int i = 0; i < bookmarkPositionSparseBooleanArray.size(); i++) {
+ // Find the bookmark that is selected and save the position to `selectedBookmarkPosition`.
+ if (bookmarkPositionSparseBooleanArray.valueAt(i))
+ selectedBookmarkPosition = bookmarkPositionSparseBooleanArray.keyAt(i);
+ }
updateBookmarksListViewExcept(selectedBookmarksLongArray, currentFolder);
// Scroll to where the deleted bookmark was located.
- bookmarksListView.setSelection(selectedBookmarkPosition);
+ bookmarksListView.setSelection(selectedBookmarkPosition - 5);
String snackbarMessage;
// Refresh the ListView to show the rows again.
updateBookmarksListView(currentFolder);
+ // Scroll to where the deleted bookmark was located.
+ bookmarksListView.setSelection(selectedBookmarkPosition - 5);
+
break;
// The Snackbar was dismissed without the "Undo" button being pushed.
// Convert `databaseIdLong` to an int.
int databaseIdInt = (int) databaseIdLong;
- // Delete the database row.
+ if (bookmarksDatabaseHandler.isFolder(databaseIdInt)) {
+ deleteBookmarkFolderContents(databaseIdInt);
+ }
+
+ // Delete `databaseIdInt`.
bookmarksDatabaseHandler.deleteBookmark(databaseIdInt);
}
break;
EditText createBookmarkUrlEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.create_bookmark_url_edittext);
String bookmarkUrlString = createBookmarkUrlEditText.getText().toString();
- // Convert the favoriteIcon Bitmap to a byte array. `0` is for lossless compression (the only option for a PNG).
+ // Convert the favoriteIcon Bitmap to a byte array.
ByteArrayOutputStream favoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
+ // `0` is for lossless compression (the only option for a PNG).
MainWebViewActivity.favoriteIcon.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream);
byte[] favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray();
String cannotCreateFolder = getResources().getString(R.string.cannot_create_folder) + " \"" + folderNameString + "\"";
Snackbar.make(findViewById(R.id.bookmarks_coordinatorlayout), cannotCreateFolder, Snackbar.LENGTH_INDEFINITE).show();
} else { // Create the folder.
- // Get the new folder icon.
+ // Get the new folder icon `Bitmap`.
RadioButton defaultFolderIconRadioButton = (RadioButton) dialogFragment.getDialog().findViewById(R.id.create_folder_default_icon_radiobuttion);
Bitmap folderIconBitmap;
if (defaultFolderIconRadioButton.isChecked()) {
- // Get the default folder icon drawable and convert it to a `Bitmap`. `this` specifies the current context.
- Drawable folderIconDrawable = ContextCompat.getDrawable(this, R.drawable.folder_blue_bitmap);
+ // Get the default folder icon `ImageView` from the `Dialog` and convert it to a `Bitmap`.
+ ImageView folderIconImageView = (ImageView) dialogFragment.getDialog().findViewById(R.id.create_folder_default_icon);
+ Drawable folderIconDrawable = folderIconImageView.getDrawable();
BitmapDrawable folderIconBitmapDrawable = (BitmapDrawable) folderIconDrawable;
folderIconBitmap = folderIconBitmapDrawable.getBitmap();
- } else {
+ } else { // Assign `favoriteIcon` from the `WebView`.
folderIconBitmap = MainWebViewActivity.favoriteIcon;
}
- // Convert the folder `Bitmap` to a byte array. `0` is for lossless compression (the only option for a PNG).
+ // Convert `folderIconBitmap` to a byte array. `0` is for lossless compression (the only option for a PNG).
ByteArrayOutputStream folderIconByteArrayOutputStream = new ByteArrayOutputStream();
folderIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, folderIconByteArrayOutputStream);
byte[] folderIconByteArray = folderIconByteArrayOutputStream.toByteArray();
if (currentBookmarkIconRadioButton.isChecked()) { // Update the bookmark without changing the favorite icon.
bookmarksDatabaseHandler.updateBookmark(selectedBookmarkDatabaseId, bookmarkNameString, bookmarkUrlString);
- } else { // Update the bookmark and the favorite icon.
- // Get the new favorite icon from the `Dialog` and convert it into a `Bitmap`.
- ImageView newFavoriteIconImageView = (ImageView) dialogFragment.getDialog().findViewById(R.id.edit_bookmark_web_page_favorite_icon);
- Drawable newFavoriteIconDrawable = newFavoriteIconImageView.getDrawable();
- Bitmap newFavoriteIconBitmap = ((BitmapDrawable) newFavoriteIconDrawable).getBitmap();
-
- // Convert `newFavoriteIconBitmap` into a Byte Array.
+ } else { // Update the bookmark using the `WebView` favorite icon.
ByteArrayOutputStream newFavoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
- newFavoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, newFavoriteIconByteArrayOutputStream);
+ MainWebViewActivity.favoriteIcon.compress(Bitmap.CompressFormat.PNG, 0, newFavoriteIconByteArrayOutputStream);
byte[] newFavoriteIconByteArray = newFavoriteIconByteArrayOutputStream.toByteArray();
// Update the bookmark and the favorite icon.
int existingFoldersWithNewName = bookmarkFolderCursor.getCount();
bookmarkFolderCursor.close();
if ( ((existingFoldersWithNewName == 0) || newFolderNameString.equals(oldFolderNameString)) && !newFolderNameString.isEmpty()) {
- // Get a long array with the the databaseId of the selected folder and convert it to an `int`.
+ // Get a long array with the the database ID of the selected folder and convert it to an `int`.
long[] selectedFolderLongArray = bookmarksListView.getCheckedItemIds();
int selectedFolderDatabaseId = (int) selectedFolderLongArray[0];
// Get the `RadioButtons` from the `Dialog`.
RadioButton currentFolderIconRadioButton = (RadioButton) dialogFragment.getDialog().findViewById(R.id.edit_folder_current_icon_radiobutton);
RadioButton defaultFolderIconRadioButton = (RadioButton) dialogFragment.getDialog().findViewById(R.id.edit_folder_default_icon_radiobutton);
- Bitmap folderIconBitmap;
- // Prepare the favorite icon.
+ // Check if the favorite icon has changed.
if (currentFolderIconRadioButton.isChecked()) {
- // Update the folder name if it has changed.
+ // Update the folder name if it has changed without modifying the favorite icon.
if (!newFolderNameString.equals(oldFolderNameString)) {
bookmarksDatabaseHandler.updateFolder(selectedFolderDatabaseId, oldFolderNameString, newFolderNameString);
updateBookmarksListView(currentFolder);
bookmarksListView.setSelection(selectedBookmarkPosition);
}
- } else { // Prepare the new favorite icon.
+ } else { // Update the folder icon.
+ // Get the new folder icon `Bitmap`.
+ Bitmap folderIconBitmap;
if (defaultFolderIconRadioButton.isChecked()) {
- // Get the default folder icon drawable and convert it to a `Bitmap`. `this` specifies the current context.
- Drawable folderIconDrawable = ContextCompat.getDrawable(this, R.drawable.folder_blue_bitmap);
+ // Get the default folder icon `ImageView` from the `Drawable` and convert it to a `Bitmap`.
+ ImageView folderIconImageView = (ImageView) dialogFragment.getDialog().findViewById(R.id.edit_folder_default_icon);
+ Drawable folderIconDrawable = folderIconImageView.getDrawable();
BitmapDrawable folderIconBitmapDrawable = (BitmapDrawable) folderIconDrawable;
folderIconBitmap = folderIconBitmapDrawable.getBitmap();
- } else { // Use the web page favorite icon.
+ } else { // Get the web page icon `ImageView` from the `Dialog`.
folderIconBitmap = MainWebViewActivity.favoriteIcon;
}
String cannot_rename_folder = getResources().getString(R.string.cannot_rename_folder) + " \"" + newFolderNameString + "\"";
Snackbar.make(findViewById(R.id.bookmarks_coordinatorlayout), cannot_rename_folder, Snackbar.LENGTH_INDEFINITE).show();
}
+
+ // Close the contextual action mode.
+ contextualActionMode.finish();
+ }
+
+ @Override
+ public void onCancelMoveToFolder(DialogFragment dialogFragment) {
+ // Do nothing because the user selected `Cancel`.
+ }
+
+ @Override
+ public void onMoveToFolder(DialogFragment dialogFragment) {
+ // Get the new folder database id.
+ ListView folderListView = (ListView) dialogFragment.getDialog().findViewById(R.id.move_to_folder_listview);
+ long[] newFolderLongArray = folderListView.getCheckedItemIds();
+
+ if (newFolderLongArray.length == 0) { // No new folder was selected.
+ Snackbar.make(findViewById(R.id.bookmarks_coordinatorlayout), getString(R.string.cannot_move_bookmarks), Snackbar.LENGTH_LONG).show();
+ } else { // Move the selected bookmarks.
+ // Get the new folder database ID.
+ int newFolderDatabaseId = (int) newFolderLongArray[0];
+
+ // Instantiate `newFolderName`.
+ String newFolderName;
+
+ if (newFolderDatabaseId == 0) {
+ // The new folder is the home folder, represented as `""` in the database.
+ newFolderName = "";
+ } else {
+ // Get the new folder name from the database.
+ newFolderName = bookmarksDatabaseHandler.getFolderName(newFolderDatabaseId);
+ }
+
+ // Get a long array with the the database ID of the selected bookmarks.
+ long[] selectedBookmarksLongArray = bookmarksListView.getCheckedItemIds();
+ for (long databaseIdLong : selectedBookmarksLongArray) {
+ // Get `databaseIdInt` for each selected bookmark.
+ int databaseIdInt = (int) databaseIdLong;
+
+ // Move the selected bookmark to the new folder.
+ bookmarksDatabaseHandler.moveToFolder(databaseIdInt, newFolderName);
+ }
+
+ // Refresh the `ListView`.
+ updateBookmarksListView(currentFolder);
+
+ // Close the contextual app bar.
+ contextualActionMode.finish();
+ }
}
private void updateBookmarksListView(String folderName) {
// Get a `Cursor` with the current contents of the bookmarks database.
bookmarksCursor = bookmarksDatabaseHandler.getAllBookmarksCursorByDisplayOrder(folderName);
- // Setup `bookmarksCursorAdapter` with `this` context. The `false` disables autoRequery.
+ // Setup `bookmarksCursorAdapter` with `this` context. `false` disables autoRequery.
CursorAdapter bookmarksCursorAdapter = new CursorAdapter(this, bookmarksCursor, false) {
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
// Get a `Cursor` with the current contents of the bookmarks database except for the specified database IDs.
bookmarksCursor = bookmarksDatabaseHandler.getBookmarksCursorExcept(exceptIdLongArray, folderName);
- // Setup `bookmarksCursorAdapter` with `this` context. The `false` disables autoRequery.
+ // Setup `bookmarksCursorAdapter` with `this` context. `false` disables autoRequery.
CursorAdapter bookmarksCursorAdapter = new CursorAdapter(this, bookmarksCursor, false) {
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
// Update the ListView.
bookmarksListView.setAdapter(bookmarksCursorAdapter);
}
+
+ private void deleteBookmarkFolderContents(int databaseId) {
+ // Get the name of the folder.
+ String folderName = bookmarksDatabaseHandler.getFolderName(databaseId);
+
+ // Get the contents of the folder.
+ Cursor folderCursor = bookmarksDatabaseHandler.getAllBookmarksCursorByDisplayOrder(folderName);
+
+ for (int i = 0; i < folderCursor.getCount(); i++) {
+ // Move `folderCursor` to the current row.
+ folderCursor.moveToPosition(i);
+
+ // Get the database ID of the item.
+ int itemDatabaseId = folderCursor.getInt(folderCursor.getColumnIndex(BookmarksDatabaseHandler._ID));
+
+ // If this is a folder, delete the contents first.
+ if (bookmarksDatabaseHandler.isFolder(itemDatabaseId)) {
+ deleteBookmarkFolderContents(itemDatabaseId);
+ }
+
+ bookmarksDatabaseHandler.deleteBookmark(itemDatabaseId);
+ }
+ }
}
\ No newline at end of file
projects / PrivacyBrowserAndroid.git / blobdiff