X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FAddDomainDialog.kt;h=00d281afcfcfc24465be27107aa69726753d0956;hb=3b5b81db53b0ee6f448ac3144a176c6d9042f4c8;hp=c67e23b0870fb910ad3541888c251c20cee398e8;hpb=1b27ac6f2b7c046945fc97e2aff9adbde8a152ce;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt
index c67e23b0..00d281af 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2023 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -48,7 +48,7 @@ class AddDomainDialog : DialogFragment() {
 
     // The public interface is used to send information back to the parent activity.
     interface AddDomainListener {
-        fun onAddDomain(dialogFragment: DialogFragment)
+        fun addDomain(dialogFragment: DialogFragment)
     }
 
     override fun onAttach(context: Context) {
@@ -60,9 +60,7 @@ class AddDomainDialog : DialogFragment() {
     }
 
     companion object {
-        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.
-        @JvmStatic
-        fun addDomain(urlString: String): AddDomainDialog {
+        fun addDomain(urlString: String?): AddDomainDialog {
             // Create an arguments bundle.
             val argumentsBundle = Bundle()
 
@@ -105,7 +103,7 @@ class AddDomainDialog : DialogFragment() {
         // Set the add button listener.
         dialogBuilder.setPositiveButton(R.string.add) { _: DialogInterface, _: Int ->
             // Return the dialog fragment to the parent activity on add.
-            addDomainListener.onAddDomain(this)
+            addDomainListener.addDomain(this)
         }
 
         // Create an alert dialog from the builder.
@@ -115,7 +113,7 @@ class AddDomainDialog : DialogFragment() {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
 
         // Get the screenshot preference.
-        val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots), false)
+        val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)
 
         // Disable screenshots if not allowed.
         if (!allowScreenshots) {
@@ -125,8 +123,8 @@ class AddDomainDialog : DialogFragment() {
         // The alert dialog must be shown before the contents can be modified.
         alertDialog.show()
 
-        // Initialize the domains database helper.  The `0` specifies the database version, but that is ignored and set instead using a constant in domains database helper.
-        val domainsDatabaseHelper = DomainsDatabaseHelper(context, null, null, 0)
+        // Initialize the domains database helper.
+        val domainsDatabaseHelper = DomainsDatabaseHelper(requireContext())
 
         // Get handles for the views in the alert dialog.
         val addDomainEditText = alertDialog.findViewById<EditText>(R.id.domain_name_edittext)!!
@@ -171,7 +169,7 @@ class AddDomainDialog : DialogFragment() {
             // Check the key code and event.
             if (keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN) {  // The event is a key-down on the enter key.
                 // Trigger the add domain listener and return the dialog fragment to the parent activity.
-                addDomainListener.onAddDomain(this)
+                addDomainListener.addDomain(this)
 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()