Fix a crash when opening a drawer while restarting. https://redmine.stoutner.com...

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

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AboutViewSourceDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AboutViewSourceDialog.kt
index 21b8c4a24924a6fce29bbfa32b6db59002a842f4..a862fb44ffcaaae8170b4563de1a854ca735b553 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AboutViewSourceDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AboutViewSourceDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2018-2021 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -19,10 +19,11 @@
 
 package com.stoutner.privacybrowser.dialogs
 
-import android.app.AlertDialog
 import android.app.Dialog
 import android.os.Bundle
 import android.view.WindowManager
+
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 
@@ -30,30 +31,11 @@ import com.stoutner.privacybrowser.R
 
 class AboutViewSourceDialog : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        // Get a handle for the shared preferences.
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-
-        // Get the screenshot and theme preferences.
-        val allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false)
-        val darkTheme = sharedPreferences.getBoolean("dark_theme", false)
-
         // Use a builder to create the alert dialog.
-        val dialogBuilder: AlertDialog.Builder
-
-        // Set the style and the icon according to the theme.
-        if (darkTheme) {
-            // Use a dark style.
-            dialogBuilder = AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialogDark)
+        val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
 
-            // Set a dark icon.
-            dialogBuilder.setIcon(R.drawable.about_dark)
-        } else {
-            // Use a light style.
-            dialogBuilder = AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialogLight)
-
-            // Set a light icon.
-            dialogBuilder.setIcon(R.drawable.about_light)
-        }
+        // Set the icon according to the theme.
+        dialogBuilder.setIconAttribute(R.attr.aboutBlueIcon)
 
         // Set the title.
         dialogBuilder.setTitle(R.string.about_view_source)
@@ -61,12 +43,18 @@ class AboutViewSourceDialog : DialogFragment() {
         // Set the text.
         dialogBuilder.setMessage(R.string.about_view_source_message)
 
-        // Set a listener on the close button.  Using `null` as the listener closes the dialog without doing anything else.
+        // Set the close button listener.  Using `null` as the listener closes the dialog without doing anything else.
         dialogBuilder.setNegativeButton(R.string.close, null)
 
         // Create an alert dialog from the alert dialog builder.
         val alertDialog = dialogBuilder.create()
 
+        // Get a handle for the shared preferences.
+        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+
+        // Get the screenshot preference.
+        val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)
+
         // Disable screenshots if not allowed.
         if (!allowScreenshots) {
             alertDialog.window!!.addFlags(WindowManager.LayoutParams.FLAG_SECURE)