X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FHttpAuthenticationDialog.kt;h=d7fe8f9bcbe767ccd2ffb37e33ea24cb2f81ef25;hp=0e8a08db715a5dd60ae8c71593a5527434b4fc57;hb=1b27ac6f2b7c046945fc97e2aff9adbde8a152ce;hpb=aa121d6d6df14a0425ac3b5603765dbae7e8d156 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 0e8a08db..d7fe8f9b 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt @@ -1,28 +1,26 @@ /* - * Copyright © 2017-2021 Soren Stoutner . + * Copyright © 2017-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of 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 . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.dialogs -import android.annotation.SuppressLint import android.app.Dialog import android.content.DialogInterface -import android.content.res.Configuration import android.os.Bundle import android.text.SpannableStringBuilder import android.text.Spanned @@ -78,8 +76,6 @@ class HttpAuthenticationDialog : DialogFragment() { } } - // `@SuppressLint("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`. - @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get a handle for the arguments. val arguments = requireArguments() @@ -109,29 +105,30 @@ class HttpAuthenticationDialog : DialogFragment() { // Use an alert dialog builder to create the alert dialog. val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) - // Set the icon according to the theme. - dialogBuilder.setIconAttribute(R.attr.lockBlueIcon) + // Set the icon. + dialogBuilder.setIcon(R.drawable.lock) // Set the title. dialogBuilder.setTitle(R.string.http_authentication) - // 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 view. + dialogBuilder.setView(R.layout.http_authentication_dialog) // 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() - }// Set the proceed button listener. + // Reset the HTTP authentication handler. + nestedScrollWebView.resetHttpAuthHandler() + } + } + + // 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. @@ -141,7 +138,7 @@ class HttpAuthenticationDialog : DialogFragment() { val dialogWindow = alertDialog.window!! // 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) @@ -170,17 +167,8 @@ class HttpAuthenticationDialog : DialogFragment() { val hostLabel = getString(R.string.host) + " " val hostStringBuilder = SpannableStringBuilder(hostLabel + httpAuthHost) - // Get the current theme status. - val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK - - // Set the blue color span according to the theme. The deprecated `getColor()` must be used until API >= 23. - 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_700)) - } + // Set the blue color span. + val blueColorSpan = ForegroundColorSpan(requireContext().getColor(R.color.blue_text)) // Setup the span to display the host name in blue. `SPAN_INCLUSIVE_INCLUSIVE` allows the span to grow in either direction. hostStringBuilder.setSpan(blueColorSpan, hostLabel.length, hostStringBuilder.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) @@ -193,7 +181,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() @@ -210,7 +198,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() @@ -249,8 +237,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