Bump the target API to 32 (Android 12L). https://redmine.stoutner.com/issues/828

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / dialogs / MoveToFolderDialog.kt

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.kt
index 0f722cdcc9e84657874167016012d6a1fa7e368e..101e6b3256585fb1344bf703e3130d241a28779d 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.kt
@@ -101,14 +101,14 @@ class MoveToFolderDialog : DialogFragment() {
         val currentFolder = requireArguments().getString(CURRENT_FOLDER)!!
         val selectedBookmarksLongArray = requireArguments().getLongArray(SELECTED_BOOKMARKS_LONG_ARRAY)!!
 
-        // Initialize the database helper.  The `0` specifies a database version, but that is ignored and set instead using a constant in the bookmarks database helper.
-        bookmarksDatabaseHelper = BookmarksDatabaseHelper(context, null, null, 0)
+        // Initialize the database helper.
+        bookmarksDatabaseHelper = BookmarksDatabaseHelper(requireContext())
 
         // Use an alert dialog builder to create the alert dialog.
         val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
 
-        // Set the icon according to the theme.
-        dialogBuilder.setIconAttribute(R.attr.moveToFolderBlueIcon)
+        // Set the icon.
+        dialogBuilder.setIcon(R.drawable.move_to_folder_blue)
 
         // Set the title.
         dialogBuilder.setTitle(R.string.move_to_folder)
@@ -195,7 +195,7 @@ class MoveToFolderDialog : DialogFragment() {
             val homeFolderIconByteArray = homeFolderIconByteArrayOutputStream.toByteArray()
 
             // Setup the home folder matrix cursor column names.
-            val homeFolderMatrixCursorColumnNames = arrayOf(BookmarksDatabaseHelper._ID, BookmarksDatabaseHelper.BOOKMARK_NAME, BookmarksDatabaseHelper.FAVORITE_ICON)
+            val homeFolderMatrixCursorColumnNames = arrayOf(BookmarksDatabaseHelper.ID, BookmarksDatabaseHelper.BOOKMARK_NAME, BookmarksDatabaseHelper.FAVORITE_ICON)
 
             // Setup a matrix cursor for the `Home Folder`.
             val homeFolderMatrixCursor = MatrixCursor(homeFolderMatrixCursorColumnNames)