X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FHttpAuthenticationDialog.kt;h=fc506f42fdaf9b71323dd319cc960e64cfc8ceb3;hb=6ea3e4ebd779594b45ad8f51cc40761bb6d89030;hp=dca6032dc74abe26f574139166fcc057e3db8495;hpb=9cb208c1f5c7a905f787f4ec4795a92e72195fba;p=PrivacyBrowserAndroid.git 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 dca6032d..fc506f42 100644 --- 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-2020 Soren Stoutner . + * Copyright © 2017-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -16,6 +16,7 @@ * You should have received a copy of the GNU General Public License * along with Privacy Browser. If not, see . */ + package com.stoutner.privacybrowser.dialogs import android.annotation.SuppressLint @@ -41,21 +42,21 @@ import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.activities.MainWebViewActivity import com.stoutner.privacybrowser.views.NestedScrollWebView -// Declare the class constants. +// Define the class constants. private const val HOST = "host" private const val REALM = "realm" private const val WEBVIEW_FRAGMENT_ID = "webview_fragment_id" -class HttpAuthenticationDialog: DialogFragment() { +class HttpAuthenticationDialog : DialogFragment() { // Define the class variables. private var dismissDialog: Boolean = false - // Define the class views. + // 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. Also, the function can then be moved out of a companion object and just become a package-level function. + // `@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. @@ -106,7 +107,7 @@ class HttpAuthenticationDialog: DialogFragment() { val httpAuthHandler = nestedScrollWebView.httpAuthHandler // Use an alert dialog builder to create the alert dialog. - val dialogBuilder = AlertDialog.Builder(requireActivity(), R.style.PrivacyBrowserAlertDialog) + val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) // Set the icon according to the theme. dialogBuilder.setIconAttribute(R.attr.lockBlueIcon) @@ -114,26 +115,24 @@ class HttpAuthenticationDialog: DialogFragment() { // Set the title. dialogBuilder.setTitle(R.string.http_authentication) - // Get the activity's layout inflater. - val layoutInflater = requireActivity().layoutInflater - - // Set the layout. The parent view is `null` because it will be assigned by the alert dialog. + // Set the view. The parent view is `null` because it will be assigned by the alert dialog. dialogBuilder.setView(layoutInflater.inflate(R.layout.http_authentication_dialog, null)) // Set the close button listener. dialogBuilder.setNegativeButton(R.string.close) { _: DialogInterface?, _: Int -> - // Cancel the HTTP authentication request. - httpAuthHandler.cancel() + if (httpAuthHandler != null) { + // Cancel the HTTP authentication request. + httpAuthHandler.cancel() + + // Reset the HTTP authentication handler. + nestedScrollWebView.resetHttpAuthHandler() + } + } - // Reset the HTTP authentication handler. - nestedScrollWebView.resetHttpAuthHandler() - }// Set the proceed button listener. + // Set the proceed button listener. dialogBuilder.setPositiveButton(R.string.proceed) { _: DialogInterface?, _: Int -> // Send the login information - login(httpAuthHandler) - - // Reset the HTTP authentication handler. - nestedScrollWebView.resetHttpAuthHandler() + login(httpAuthHandler, nestedScrollWebView) } // Create an alert dialog from the alert dialog builder. @@ -175,16 +174,13 @@ class HttpAuthenticationDialog: DialogFragment() { // Get the current theme status. val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK - // Create a blue foreground color span. - val blueColorSpan: ForegroundColorSpan - // Set the blue color span according to the theme. The deprecated `getColor()` must be used until API >= 23. - blueColorSpan = if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + val blueColorSpan = if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { @Suppress("DEPRECATION") ForegroundColorSpan(resources.getColor(R.color.blue_700)) } else { @Suppress("DEPRECATION") - ForegroundColorSpan(resources.getColor(R.color.violet_500)) + ForegroundColorSpan(resources.getColor(R.color.violet_700)) } // Setup the span to display the host name in blue. `SPAN_INCLUSIVE_INCLUSIVE` allows the span to grow in either direction. @@ -198,7 +194,7 @@ class HttpAuthenticationDialog: DialogFragment() { // Check the key code and event. if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_DOWN) { // The enter key was pressed. // Send the login information. - login(httpAuthHandler) + login(httpAuthHandler, nestedScrollWebView) // Manually dismiss the alert dialog. alertDialog.dismiss() @@ -215,7 +211,7 @@ class HttpAuthenticationDialog: DialogFragment() { // Check the key code and event. if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_DOWN) { // The enter key was pressed. // Send the login information. - login(httpAuthHandler) + login(httpAuthHandler, nestedScrollWebView) // Manually dismiss the alert dialog. alertDialog.dismiss() @@ -231,7 +227,7 @@ class HttpAuthenticationDialog: DialogFragment() { return alertDialog } catch (exception: Exception) { // Privacy Browser was restarted and the HTTP auth handler no longer exists. // Use an alert dialog builder to create an empty alert dialog. - val dialogBuilder = AlertDialog.Builder(requireActivity(), R.style.PrivacyBrowserAlertDialog) + val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) // Create an empty alert dialog from the alert dialog builder. val alertDialog = dialogBuilder.create() @@ -245,7 +241,7 @@ class HttpAuthenticationDialog: DialogFragment() { } override fun onResume() { - // Run the default command. + // Run the default commands. super.onResume() // Dismiss the alert dialog if the activity was restarted and the HTTP auth handler no longer exists. @@ -254,8 +250,13 @@ class HttpAuthenticationDialog: DialogFragment() { } } - private fun login(httpAuthHandler: HttpAuthHandler) { - // Send the login information. - httpAuthHandler.proceed(usernameEditText.text.toString(), passwordEditText.text.toString()) + private fun login(httpAuthHandler: HttpAuthHandler?, nestedScrollWebView: NestedScrollWebView) { + if (httpAuthHandler != null) { + // Send the login information. + httpAuthHandler.proceed(usernameEditText.text.toString(), passwordEditText.text.toString()) + + // Reset the HTTP authentication handler. + nestedScrollWebView.resetHttpAuthHandler() + } } } \ No newline at end of file