X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkFolderDialog.kt;h=7427173d9c87d7767a33dd5801f21c47fa6aa04c;hb=4395165965c4a211f7c03583ebca6edaa5bf19fe;hp=2a4bc9f347e01f7d6fc92b2a0e9157b0cfe74662;hpb=1d656c562831f535aa33903d44198dd890393f4f;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt index 2a4bc9f3..7427173d 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt @@ -1,20 +1,20 @@ /* - * Copyright © 2016-2021 Soren Stoutner . + * Copyright 2016-2023 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 @@ -41,6 +41,8 @@ import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R +import com.stoutner.privacybrowser.helpers.BOOKMARK_NAME +import com.stoutner.privacybrowser.helpers.FAVORITE_ICON import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper import java.io.ByteArrayOutputStream @@ -50,33 +52,8 @@ private const val DATABASE_ID = "database_id" private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" class EditBookmarkFolderDialog : DialogFragment() { - // Declare the class variables. - private lateinit var editBookmarkFolderListener: EditBookmarkFolderListener - private lateinit var bookmarksDatabaseHelper: BookmarksDatabaseHelper - private lateinit var currentFolderName: String - - // Declare the class views. - private lateinit var currentIconRadioButton: RadioButton - private lateinit var folderNameEditText: EditText - private lateinit var saveButton: Button - - // The public interface is used to send information back to the parent activity. - interface EditBookmarkFolderListener { - fun onSaveBookmarkFolder(dialogFragment: DialogFragment, selectedFolderDatabaseId: Int, favoriteIconBitmap: Bitmap) - } - - override fun onAttach(context: Context) { - // Run the default commands. - super.onAttach(context) - - // Get a handle for the edit bookmark folder listener from the launching context. - editBookmarkFolderListener = context as EditBookmarkFolderListener - } - companion object { - // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. - @JvmStatic - fun folderDatabaseId(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkFolderDialog { + fun editFolder(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkFolderDialog { // Create a favorite icon byte array output stream. val favoriteIconByteArrayOutputStream = ByteArrayOutputStream() @@ -104,6 +81,29 @@ class EditBookmarkFolderDialog : DialogFragment() { } } + // Declare the class variables. + private lateinit var editBookmarkFolderListener: EditBookmarkFolderListener + private lateinit var bookmarksDatabaseHelper: BookmarksDatabaseHelper + private lateinit var currentFolderName: String + + // Declare the class views. + private lateinit var currentIconRadioButton: RadioButton + private lateinit var folderNameEditText: EditText + private lateinit var saveButton: Button + + // The public interface is used to send information back to the parent activity. + interface EditBookmarkFolderListener { + fun onSaveBookmarkFolder(dialogFragment: DialogFragment, selectedFolderDatabaseId: Int, favoriteIconBitmap: Bitmap) + } + + override fun onAttach(context: Context) { + // Run the default commands. + super.onAttach(context) + + // Get a handle for the edit bookmark folder listener from the launching context. + editBookmarkFolderListener = context as EditBookmarkFolderListener + } + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get a handle for the arguments. val arguments = requireArguments() @@ -115,8 +115,8 @@ class EditBookmarkFolderDialog : DialogFragment() { // Convert the favorite icon byte array to a bitmap. val favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.size) - // Initialize the database helper. The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`. - bookmarksDatabaseHelper = BookmarksDatabaseHelper(context, null, null, 0) + // Initialize the database helper. + bookmarksDatabaseHelper = BookmarksDatabaseHelper(requireContext()) // Get a cursor with the selected folder. val folderCursor = bookmarksDatabaseHelper.getBookmark(selectedFolderDatabaseId) @@ -146,7 +146,7 @@ class EditBookmarkFolderDialog : 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) @@ -172,7 +172,7 @@ class EditBookmarkFolderDialog : DialogFragment() { saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) // Get the current favorite icon byte array from the cursor. - val currentIconByteArray = folderCursor.getBlob(folderCursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON)) + val currentIconByteArray = folderCursor.getBlob(folderCursor.getColumnIndexOrThrow(FAVORITE_ICON)) // Convert the byte array to a bitmap beginning at the first byte and ending at the last. val currentIconBitmap = BitmapFactory.decodeByteArray(currentIconByteArray, 0, currentIconByteArray.size) @@ -184,7 +184,7 @@ class EditBookmarkFolderDialog : DialogFragment() { webpageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap) // Get the current folder name. - currentFolderName = folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) + currentFolderName = folderCursor.getString(folderCursor.getColumnIndexOrThrow(BOOKMARK_NAME)) // Display the current folder name. folderNameEditText.setText(currentFolderName) @@ -277,22 +277,13 @@ class EditBookmarkFolderDialog : DialogFragment() { // Get the new folder name. val newFolderName = folderNameEditText.text.toString() - // Get a cursor for the new folder name if it exists. - val folderExistsCursor = bookmarksDatabaseHelper.getFolder(newFolderName) - - // Is the new folder name empty? - val folderNameEmpty = newFolderName.isEmpty() - - // Does the folder name already exist? - val folderNameAlreadyExists = (newFolderName != currentFolderName) && folderExistsCursor.count > 0 - // Has the folder been renamed? - val folderRenamed = (newFolderName != currentFolderName) && !folderNameAlreadyExists + val folderRenamed = (newFolderName != currentFolderName) // Has the favorite icon changed? - val iconChanged = !currentIconRadioButton.isChecked && !folderNameAlreadyExists + val iconChanged = !currentIconRadioButton.isChecked - // Enable the save button if something has been edited and the new folder name is valid. - saveButton.isEnabled = !folderNameEmpty && (folderRenamed || iconChanged) + // Enable the save button if something has been edited and the new folder name is not valid. + saveButton.isEnabled = newFolderName.isNotBlank() && (folderRenamed || iconChanged) } -} \ No newline at end of file +}