X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkFolderDialog.kt;h=04d7d250c7553cdfcbf3418f51296ecc997bb9de;hb=2562fecd31bce18ba708033e5b69736dc82e737d;hp=39ad0fcabcf0494307d4ded22e2878fb4b703726;hpb=dc36dea65a4eb37496fb1ecbbd9f8e1906f50216;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt
index 39ad0fca..04d7d250 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt
@@ -40,7 +40,6 @@ import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 
 import com.stoutner.privacybrowser.R
-import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper
 
 import java.io.ByteArrayOutputStream
 
@@ -81,7 +80,7 @@ class CreateBookmarkFolderDialog : DialogFragment() {
 
     // The public interface is used to send information back to the parent activity.
     interface CreateBookmarkFolderListener {
-        fun onCreateBookmarkFolder(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap)
+        fun createBookmarkFolder(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap)
     }
 
     override fun onAttach(context: Context) {
@@ -117,7 +116,7 @@ class CreateBookmarkFolderDialog : DialogFragment() {
         // Set the create button listener.
         dialogBuilder.setPositiveButton(R.string.create) { _: DialogInterface, _: Int ->
             // Return the dialog fragment to the parent activity on create.
-            createBookmarkFolderListener.onCreateBookmarkFolder(this, favoriteIconBitmap)
+            createBookmarkFolderListener.createBookmarkFolder(this, favoriteIconBitmap)
         }
 
         // Create an alert dialog from the builder.
@@ -177,10 +176,7 @@ class CreateBookmarkFolderDialog : DialogFragment() {
             defaultIconRadioButton.isChecked = false
         }
 
-        // Initialize the database helper.
-        val bookmarksDatabaseHelper = BookmarksDatabaseHelper(requireContext())
-
-        // Enable the create button if the new folder name is unique.
+        // Enable the create button if the folder name is populated.
         folderNameEditText.addTextChangedListener(object: TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
                 // Do nothing.
@@ -194,11 +190,8 @@ class CreateBookmarkFolderDialog : DialogFragment() {
                 // Convert the current text to a string.
                 val folderName = editable.toString()
 
-                // Check if a folder with the name already exists.
-                val folderExistsCursor = bookmarksDatabaseHelper.getFolder(folderName)
-
-                // Enable the create button if the new folder name is not empty and doesn't already exist.
-                createButton.isEnabled = folderName.isNotEmpty() && (folderExistsCursor.count == 0)
+                // Enable the create button if the new folder name is not empty.
+                createButton.isEnabled = folderName.isNotEmpty()
             }
         })
 
@@ -207,7 +200,7 @@ class CreateBookmarkFolderDialog : DialogFragment() {
             // Check the key code, event, and button status.
             if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && createButton.isEnabled) {  // The event is a key-down on the enter key and the create button is enabled.
                 // Trigger the create bookmark folder listener and return the dialog fragment to the parent activity.
-                createBookmarkFolderListener.onCreateBookmarkFolder(this, favoriteIconBitmap)
+                createBookmarkFolderListener.createBookmarkFolder(this, favoriteIconBitmap)
 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
@@ -222,4 +215,4 @@ class CreateBookmarkFolderDialog : DialogFragment() {
         // Return the alert dialog.
         return alertDialog
     }
-}
\ No newline at end of file
+}