Add import and export of bookmarks to HTML file. https://redmine.stoutner.com/issues/91

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

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt
index d7fe8f9bcbe767ccd2ffb37e33ea24cb2f81ef25..1f2f1f2fc51b42b75d81ff60b5968a9e00a7dfd8 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2023 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -46,16 +46,7 @@ private const val REALM = "realm"
 private const val WEBVIEW_FRAGMENT_ID = "webview_fragment_id"
 
 class HttpAuthenticationDialog : DialogFragment() {
-    // Define the class variables.
-    private var dismissDialog: Boolean = false
-
-    // Declare the class views.
-    private lateinit var usernameEditText: EditText
-    private lateinit var passwordEditText: EditText
-
     companion object {
-        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.
-        @JvmStatic
         fun displayDialog(host: String, realm: String, webViewFragmentId: Long): HttpAuthenticationDialog {
             // Create an arguments bundle.
             val argumentsBundle = Bundle()
@@ -76,6 +67,13 @@ class HttpAuthenticationDialog : DialogFragment() {
         }
     }
 
+    // Define the class variables.
+    private var httpAuthHandler: HttpAuthHandler? = null
+
+    // Declare the class views.
+    private lateinit var usernameEditText: EditText
+    private lateinit var passwordEditText: EditText
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Get a handle for the arguments.
         val arguments = requireArguments()
@@ -88,10 +86,10 @@ class HttpAuthenticationDialog : DialogFragment() {
         // Try to populate the alert dialog.
         try {  // Getting the WebView tab fragment will fail if Privacy Browser has been restarted.
             // Get the current position of this WebView fragment.
-            val webViewPosition = MainWebViewActivity.webViewPagerAdapter.getPositionForId(webViewFragmentId)
+            val webViewPosition = MainWebViewActivity.webViewStateAdapter!!.getPositionForId(webViewFragmentId)
 
             // Get the WebView tab fragment.
-            val webViewTabFragment = MainWebViewActivity.webViewPagerAdapter.getPageFragment(webViewPosition)
+            val webViewTabFragment = MainWebViewActivity.webViewStateAdapter!!.getPageFragment(webViewPosition)
 
             // Get the fragment view.
             val fragmentView = webViewTabFragment.requireView()
@@ -100,7 +98,7 @@ class HttpAuthenticationDialog : DialogFragment() {
             val nestedScrollWebView = fragmentView.findViewById<NestedScrollWebView>(R.id.nestedscroll_webview)
 
             // Get a handle for the HTTP authentication handler.
-            val httpAuthHandler = nestedScrollWebView.httpAuthHandler
+            httpAuthHandler = nestedScrollWebView.httpAuthHandler
 
             // Use an alert dialog builder to create the alert dialog.
             val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
@@ -118,7 +116,7 @@ class HttpAuthenticationDialog : DialogFragment() {
             dialogBuilder.setNegativeButton(R.string.close) { _: DialogInterface?, _: Int ->
                 if (httpAuthHandler != null) {
                     // Cancel the HTTP authentication request.
-                    httpAuthHandler.cancel()
+                    httpAuthHandler!!.cancel()
 
                     // Reset the HTTP authentication handler.
                     nestedScrollWebView.resetHttpAuthHandler()
@@ -164,7 +162,7 @@ class HttpAuthenticationDialog : DialogFragment() {
             realmTextView.text = httpAuthRealm
 
             // Initialize the host label and the spannable string builder.
-            val hostLabel = getString(R.string.host) + "  "
+            val hostLabel = getString(R.string.host)
             val hostStringBuilder = SpannableStringBuilder(hostLabel + httpAuthHost)
 
             // Set the blue color span.
@@ -213,28 +211,25 @@ class HttpAuthenticationDialog : DialogFragment() {
             // Return the alert dialog.
             return alertDialog
         } catch (exception: Exception) {  // Privacy Browser was restarted and the HTTP auth handler no longer exists.
+            // Dismiss this new instance of the dialog as soon as it is displayed.
+            dismiss()
+
             // Use an alert dialog builder to create an empty alert dialog.
             val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
 
-            // Create an empty alert dialog from the alert dialog builder.
-            val alertDialog = dialogBuilder.create()
-
-            // Set the flag to dismiss the dialog as soon as it is resumed.
-            dismissDialog = true
-
             // Return the alert dialog.
-            return alertDialog
+            return dialogBuilder.create()
         }
     }
 
-    override fun onResume() {
+    override fun onSaveInstanceState(outState: Bundle) {
         // Run the default commands.
-        super.onResume()
+        super.onSaveInstanceState(outState)
 
-        // Dismiss the alert dialog if the activity was restarted and the HTTP auth handler no longer exists.
-        if (dismissDialog) {
-            dialog!!.dismiss()
-        }
+        // Cancel the request if the SSL error handler is not null.  This resets the WebView so it is not waiting on a response to the error handler if it is restarted in the background.
+        // Otherwise, after restart, the dialog is no longer displayed, but the error handler is still pending and there is no way to cause the dialog to redisplay for that URL in that tab.
+        if (httpAuthHandler != null)
+            httpAuthHandler!!.cancel()
     }
 
     private fun login(httpAuthHandler: HttpAuthHandler?, nestedScrollWebView: NestedScrollWebView) {
@@ -246,4 +241,4 @@ class HttpAuthenticationDialog : DialogFragment() {
             nestedScrollWebView.resetHttpAuthHandler()
         }
     }
-}
\ No newline at end of file
+}