Fix the ViewPager not always moving to new tabs. https://redmine.stoutner.com/issues/798

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

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 139e6576e78b7055bfac1fa4786a2706f8bead0a..0f9af89740a3665e3999e39a26fed10948c34ce9 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt
@@ -1,25 +1,24 @@
 /*
- * Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-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.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) {
@@ -183,7 +176,7 @@ class SslCertificateErrorDialog : 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_key), false)
@@ -336,7 +329,6 @@ class SslCertificateErrorDialog : DialogFragment() {
                 primaryErrorString = getString(R.string.invalid_certificate)
         }
 
-
         // Display the strings.
         primaryErrorTextView.text = primaryErrorString
         urlTextView.text = urlStringBuilder