/*
- * Copyright © 2017-2021 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-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.Dialog
import android.content.DialogInterface
-import android.content.res.Configuration
import android.os.Bundle
import android.text.SpannableStringBuilder
import android.text.Spanned
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"
// 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
}
}
- // `@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()
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)
+ // Set the icon.
+ dialogBuilder.setIcon(R.drawable.lock)
// 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.
- 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.
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)
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
-
- // 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) {
- @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)
// 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()
// 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()
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()
}
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.
}
}
- 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
projects / PrivacyBrowserAndroid.git / blobdiff