X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSslCertificateErrorDialog.kt;h=1a71f5de4da2f4b09591269a4a52be07eeb2f8e4;hb=ab11ca2de00c56982e46627c8e7fc670462b0b3c;hp=139e6576e78b7055bfac1fa4786a2706f8bead0a;hpb=031def95c6d9bfc14113fe86b4a5690233d93ce2;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt index 139e6576..1a71f5de 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt @@ -19,7 +19,6 @@ package com.stoutner.privacybrowser.dialogs -import android.annotation.SuppressLint import android.app.Activity import android.app.Dialog import android.content.DialogInterface @@ -105,8 +104,6 @@ class SslCertificateErrorDialog : 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 variables from the bundle. val primaryErrorInt = requireArguments().getInt(PRIMARY_ERROR_INT) @@ -143,19 +140,15 @@ class SslCertificateErrorDialog : DialogFragment() { val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK // Set the icon according to the theme. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - dialogBuilder.setIcon(R.drawable.ssl_certificate_enabled_day) - } else { - dialogBuilder.setIcon(R.drawable.ssl_certificate_enabled_night) - } + dialogBuilder.setIconAttribute(R.attr.sslCertificateBlueIcon) // Set the title. dialogBuilder.setTitle(R.string.ssl_certificate_error) - // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(layoutInflater.inflate(R.layout.ssl_certificate_error, null)) + // Set the view. + dialogBuilder.setView(R.layout.ssl_certificate_error) - // Set a listener on the cancel button. + // Set the cancel button listener. dialogBuilder.setNegativeButton(R.string.cancel) { _: DialogInterface?, _: Int -> // Check to make sure the SSL error handler is not null. This might happen if multiple dialogs are displayed at once. if (sslErrorHandler != null) { @@ -167,7 +160,7 @@ class SslCertificateErrorDialog : DialogFragment() { } } - // Set a listener on the proceed button. + // Set the proceed button listener. dialogBuilder.setPositiveButton(R.string.proceed) { _: DialogInterface?, _: Int -> // Check to make sure the SSL error handler is not null. This might happen if multiple dialogs are displayed at once. if (sslErrorHandler != null) { @@ -336,7 +329,6 @@ class SslCertificateErrorDialog : DialogFragment() { primaryErrorString = getString(R.string.invalid_certificate) } - // Display the strings. primaryErrorTextView.text = primaryErrorString urlTextView.text = urlStringBuilder