X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FHttpAuthenticationDialog.kt;h=b2c749bdeea2c9071657b877636770e835366bab;hb=3b5b81db53b0ee6f448ac3144a176c6d9042f4c8;hp=d7fe8f9bcbe767ccd2ffb37e33ea24cb2f81ef25;hpb=1b27ac6f2b7c046945fc97e2aff9adbde8a152ce;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 d7fe8f9b..b2c749bd 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-2022 Soren Stoutner . + * Copyright © 2017-2023 Soren Stoutner . * * This file is part of 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 dismissDialog: Boolean = false + + // 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() @@ -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.