X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkFolderDialog.kt;h=2f413b0bbf808fcf898639f4646bd1277e5238a5;hb=0019f066a3b42f018e8042089b81f0f89e43e91e;hp=3327e1f43e691dd96f18a4913a861919f8af72af;hpb=38919c77d15eeacbee96ab337afc62b30ddc74ca;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 3327e1f4..2f413b0b 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.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>.
  *
@@ -48,25 +48,7 @@ import java.io.ByteArrayOutputStream
 private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array"
 
 class CreateBookmarkFolderDialog : DialogFragment() {
-    // Declare the class variables.
-    private lateinit var createBookmarkFolderListener: CreateBookmarkFolderListener
-
-    // The public interface is used to send information back to the parent activity.
-    interface CreateBookmarkFolderListener {
-        fun onCreateBookmarkFolder(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap)
-    }
-
-    override fun onAttach(context: Context) {
-        // Run the default commands.
-        super.onAttach(context)
-
-        // Get a handle for the create bookmark folder listener from the launching context.
-        createBookmarkFolderListener = context as CreateBookmarkFolderListener
-    }
-
     companion object {
-        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.
-        @JvmStatic
         fun createBookmarkFolder(favoriteIconBitmap: Bitmap): CreateBookmarkFolderDialog {
             // Create a favorite icon byte array output stream.
             val favoriteIconByteArrayOutputStream = ByteArrayOutputStream()
@@ -94,6 +76,22 @@ class CreateBookmarkFolderDialog : DialogFragment() {
         }
     }
 
+    // Declare the class variables.
+    private lateinit var createBookmarkFolderListener: CreateBookmarkFolderListener
+
+    // The public interface is used to send information back to the parent activity.
+    interface CreateBookmarkFolderListener {
+        fun createBookmarkFolder(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap)
+    }
+
+    override fun onAttach(context: Context) {
+        // Run the default commands.
+        super.onAttach(context)
+
+        // Get a handle for the create bookmark folder listener from the launching context.
+        createBookmarkFolderListener = context as CreateBookmarkFolderListener
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Get the arguments.
         val arguments = requireArguments()
@@ -119,7 +117,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.
@@ -209,7 +207,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()
@@ -224,4 +222,4 @@ class CreateBookmarkFolderDialog : DialogFragment() {
         // Return the alert dialog.
         return alertDialog
     }
-}
\ No newline at end of file
+}