X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FAddDomainDialog.kt;h=0b2d6ed0a6a6ef554a6e2c806cbda06693adf658;hp=f2b69d5e848fe98830dae4ac2087c0e8c1f7cd38;hb=a156c3942ca31a1afca3271245cc2bda7ed5aed8;hpb=1d656c562831f535aa33903d44198dd890393f4f 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 f2b69d5e..0b2d6ed0 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt @@ -1,20 +1,20 @@ /* - * Copyright © 2017-2021 Soren Stoutner . + * Copyright © 2017-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of 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 . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.dialogs @@ -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() @@ -90,8 +88,8 @@ class AddDomainDialog : DialogFragment() { // Use an alert dialog builder to create the alert dialog. 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) @@ -112,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) @@ -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(R.id.domain_name_edittext)!!