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=8661af0a99f256ee3d84bd3642b55311a5c97d77;hb=2b1677054aa2e63e86584ddcd3b3adff3cc5444f;hpb=568ac6354411aa26c42077d2b80f8770f6e64695 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 8661af0a..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,29 +1,27 @@ /* - * Copyright © 2016-2021 Soren Stoutner . + * Copyright 2016-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of 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 . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.dialogs -import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.content.DialogInterface -import android.content.res.Configuration import android.database.Cursor import android.database.DatabaseUtils import android.database.MatrixCursor @@ -50,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 @@ -98,30 +101,25 @@ class MoveToFolderDialog : DialogFragment() { } } - // `@SuppressLint("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog. - @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the data from the arguments. 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) - // Get the current theme status. - val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK - - // 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) - // Set the view. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(layoutInflater.inflate(R.layout.move_to_folder_dialog, null)) + // Set the view. + dialogBuilder.setView(R.layout.move_to_folder_dialog) // Set the listener for the cancel button. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) @@ -136,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) @@ -195,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) @@ -279,7 +282,7 @@ class MoveToFolderDialog : DialogFragment() { subfoldersCursor.moveToPosition(i) // Get the name of the subfolder. - val subfolderName = subfoldersCursor.getString(subfoldersCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) + val subfolderName = subfoldersCursor.getString(subfoldersCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME)) // Add the subfolder to except folders. exceptFolders.append(",") @@ -300,8 +303,8 @@ class MoveToFolderDialog : DialogFragment() { override fun bindView(view: View, context: Context, cursor: Cursor) { // Get the data from the cursor. - val folderIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON)) - val folderName = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) + val folderIconByteArray = cursor.getBlob(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.FAVORITE_ICON)) + val folderName = cursor.getString(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME)) // Get handles for the views. val folderIconImageView = view.findViewById(R.id.move_to_folder_icon) @@ -318,4 +321,4 @@ class MoveToFolderDialog : DialogFragment() { } } } -} \ No newline at end of file +}