X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkFolderDatabaseViewDialog.java;fp=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkFolderDatabaseViewDialog.java;h=75e0d916b7e31d5726ce386960ae4830bab863a8;hb=572449f6c66adfc1a3d88e761cb87581a7961df3;hp=c2d44cd0baeee147acc33916f728b0eea5e1c413;hpb=b17095e4a30d08098614c82d8ddab67896c8ceb0;p=PrivacyBrowserAndroid.git 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 c2d44cd0..75e0d916 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 . * @@ -114,7 +114,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen 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. @@ -210,7 +210,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen addSubfoldersToExceptFolders(currentFolderName); // Get a `Cursor` with the list of all the folders. - Cursor foldersCursor = bookmarksDatabaseHelper.getFoldersCursorExcept(exceptFolders.toString()); + Cursor foldersCursor = bookmarksDatabaseHelper.getFoldersExcept(exceptFolders.toString()); // Combine `matrixCursor` and `foldersCursor`. MergeCursor foldersMergeCursor = new MergeCursor(new Cursor[]{matrixCursor, foldersCursor}); @@ -373,7 +373,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen 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(); @@ -402,7 +402,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends AppCompatDialogFragmen private void addSubfoldersToExceptFolders(String folderName) { // Get a `Cursor` will all the immediate subfolders. - Cursor subfoldersCursor = bookmarksDatabaseHelper.getSubfoldersCursor(folderName); + Cursor subfoldersCursor = bookmarksDatabaseHelper.getSubfolders(folderName); for (int i = 0; i < subfoldersCursor.getCount(); i++) { // Move `subfolderCursor` to the current item.