X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FMoveToFolderDialog.kt;h=0b8891f5d83f4493b7ee12a4409485dee4dbdb52;hp=575d581e039e9d95c5de6530e077dc6e7759086d;hb=2b1677054aa2e63e86584ddcd3b3adff3cc5444f;hpb=484f0b0f0143c53a4722cee3a31e714df0c8c49a

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 575d581e..0b8891f5 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.kt
@@ -1,20 +1,20 @@
 /*
- * Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2022 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.stoutner.privacybrowser.dialogs
@@ -48,6 +48,11 @@ import androidx.preference.PreferenceManager
 import com.stoutner.privacybrowser.R
 import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper
 
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
 import java.io.ByteArrayOutputStream
 import java.lang.StringBuilder
 
@@ -101,14 +106,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)
@@ -129,7 +134,7 @@ class MoveToFolderDialog : DialogFragment() {
         val alertDialog = dialogBuilder.create()
 
         // Get a handle for the shared preferences.
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
 
         // Get the screenshot preference.
         val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)
@@ -188,14 +193,19 @@ class MoveToFolderDialog : DialogFragment() {
             // Create a home folder icon byte array output stream.
             val homeFolderIconByteArrayOutputStream = ByteArrayOutputStream()
 
-            // Convert the home folder bitmap to a byte array.  `0` is for lossless compression (the only option for a PNG).
-            homeFolderIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, homeFolderIconByteArrayOutputStream)
+            // Compress the bitmap using a coroutine with Dispatchers.Default.
+            CoroutineScope(Dispatchers.Main).launch {
+                withContext(Dispatchers.Default) {
+                    // Convert the home folder bitmap to a byte array.  `0` is for lossless compression (the only option for a PNG).
+                    homeFolderIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, homeFolderIconByteArrayOutputStream)
+                }
+            }
 
             // Convert the home folder icon byte array output stream to a byte array.
             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)
@@ -311,4 +321,4 @@ class MoveToFolderDialog : DialogFragment() {
             }
         }
     }
-}
\ No newline at end of file
+}