/*
- * Copyright © 2017-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2021 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
* You should have received a copy of the GNU General Public License
* along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>.
*/
+
package com.stoutner.privacybrowser.dialogs
import android.annotation.SuppressLint
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.
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 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.
// 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.
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.