Add import and export of bookmarks to HTML file. https://redmine.stoutner.com/issues/91

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

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 a386acba5fcdc35659c0fbfad97eeaebf4402042..7427173d9c87d7767a33dd5801f21c47fa6aa04c 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2023 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -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()
@@ -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.getColumnIndexOrThrow(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.getColumnIndexOrThrow(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
+}