Fix crash when adding domain settings with null domain. https://redmine.stoutner...

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

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 8a602ef5359b02b280dc15d3442a4e4732d826b4..0b2d6ed0a6a6ef554a6e2c806cbda06693adf658 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt
@@ -1,25 +1,24 @@
 /*
- * Copyright © 2017-2021 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2022 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.stoutner.privacybrowser.dialogs
 
-import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
 import android.content.DialogInterface
@@ -61,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()
 
@@ -81,8 +78,6 @@ class AddDomainDialog : DialogFragment() {
         }
     }
 
-    // `@SuppressLint("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog.
-    @SuppressLint("InflateParams")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Get the arguments.
         val arguments = requireArguments()
@@ -91,16 +86,16 @@ class AddDomainDialog : DialogFragment() {
         val urlString = arguments.getString(URL_STRING)
 
         // Use an alert dialog builder to create the alert dialog.
-        val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
+        val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
 
-        // Set the icon according to the theme.
-        dialogBuilder.setIconAttribute(R.attr.domainsBlueIcon)
+        // Set the icon.
+        dialogBuilder.setIcon(R.drawable.domains)
 
         // Set the title.
         dialogBuilder.setTitle(R.string.add_domain)
 
-        // Set the view.  The parent view is `null` because it will be assigned by the alert dialog.
-        dialogBuilder.setView(layoutInflater.inflate(R.layout.add_domain_dialog, null))
+        // Set the view.
+        dialogBuilder.setView(R.layout.add_domain_dialog)
 
         // Set the cancel button listener.  Using `null` as the listener closes the dialog without doing anything else.
         dialogBuilder.setNegativeButton(R.string.cancel, null)
@@ -115,7 +110,7 @@ class AddDomainDialog : 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), false)
@@ -128,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)!!