X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FPinnedMismatchDialog.kt;h=66b08bbbd13937f10c32c9983402f1538be88a31;hb=dc36dea65a4eb37496fb1ecbbd9f8e1906f50216;hp=8c1288f62888079910813734b7812148020c0cfc;hpb=bda37dc9784e900cb64b87af3e221e11320d9d01;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt index 8c1288f6..66b08bbb 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt @@ -1,25 +1,24 @@ /* - * Copyright © 2017-2021 Soren Stoutner . + * Copyright 2017-2023 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.Context import android.content.DialogInterface @@ -46,25 +45,7 @@ import com.stoutner.privacybrowser.views.NestedScrollWebView private const val WEBVIEW_FRAGMENT_ID = "webview_fragment_id" class PinnedMismatchDialog : DialogFragment() { - // Declare the class variables. - private lateinit var pinnedMismatchListener: PinnedMismatchListener - - // The public interface is used to send information back to the parent activity. - interface PinnedMismatchListener { - fun pinnedErrorGoBack() - } - - override fun onAttach(context: Context) { - // Run the default commands. - super.onAttach(context) - - // Get a handle for the listener from the launching context. - pinnedMismatchListener = context as PinnedMismatchListener - } - 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 fun displayDialog(webViewFragmentId: Long): PinnedMismatchDialog { // Create an arguments bundle. val argumentsBundle = Bundle() @@ -83,17 +64,31 @@ class PinnedMismatchDialog : DialogFragment() { } } - // `@SuppressLint("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog. - @SuppressLint("InflateParams") + // Declare the class variables. + private lateinit var pinnedMismatchListener: PinnedMismatchListener + + // The public interface is used to send information back to the parent activity. + interface PinnedMismatchListener { + fun pinnedErrorGoBack() + } + + override fun onAttach(context: Context) { + // Run the default commands. + super.onAttach(context) + + // Get a handle for the listener from the launching context. + pinnedMismatchListener = context as PinnedMismatchListener + } + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the WebView fragment ID. val webViewFragmentId = requireArguments().getLong(WEBVIEW_FRAGMENT_ID) // Get the current position of this WebView fragment. - val webViewPosition = MainWebViewActivity.webViewPagerAdapter.getPositionForId(webViewFragmentId) + val webViewPosition = MainWebViewActivity.webViewPagerAdapter!!.getPositionForId(webViewFragmentId) // Get the WebView tab fragment. - val webViewTabFragment = MainWebViewActivity.webViewPagerAdapter.getPageFragment(webViewPosition) + val webViewTabFragment = MainWebViewActivity.webViewPagerAdapter!!.getPageFragment(webViewPosition) // Get the fragment view. val fragmentView = webViewTabFragment.requireView() @@ -105,7 +100,7 @@ class PinnedMismatchDialog : DialogFragment() { val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) // Get the favorite icon. - val favoriteIconBitmap = nestedScrollWebView.favoriteOrDefaultIcon + val favoriteIconBitmap = nestedScrollWebView.getFavoriteIcon() // Get the default favorite icon drawable. `ContextCompat` must be used until API >= 21. val defaultFavoriteIconDrawable = ContextCompat.getDrawable(requireContext(), R.drawable.world) @@ -118,8 +113,8 @@ class PinnedMismatchDialog : DialogFragment() { // Set the favorite icon as the dialog icon if it exists. if (favoriteIconBitmap.sameAs(defaultFavoriteIconBitmap)) { // There is no website favorite icon. - // Set the icon according to the theme. - dialogBuilder.setIconAttribute(R.attr.sslCertificateBlueIcon) + // Set the icon. + dialogBuilder.setIcon(R.drawable.ssl_certificate) } else { // There is a favorite icon. // Create a drawable version of the favorite icon. val favoriteIconDrawable: Drawable = BitmapDrawable(resources, favoriteIconBitmap) @@ -131,8 +126,8 @@ class PinnedMismatchDialog : DialogFragment() { // Set the title. dialogBuilder.setTitle(R.string.pinned_mismatch) - // Set the layout. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(layoutInflater.inflate(R.layout.pinned_mismatch_linearlayout, null)) + // Set the layout. + dialogBuilder.setView(R.layout.pinned_mismatch_linearlayout) // Set the update button listener. dialogBuilder.setNeutralButton(R.string.update) { _: DialogInterface?, _: Int -> @@ -147,8 +142,8 @@ class PinnedMismatchDialog : DialogFragment() { val currentSslStartDateLong: Long = currentSslStartDate?.time ?: 0 val currentSslEndDateLong: Long = currentSslEndDate?.time ?: 0 - // Initialize the database handler. The `0` specifies the database version, but that is ignored and set instead using a constant in the domains database helper. - val domainsDatabaseHelper = DomainsDatabaseHelper(context, null, null, 0) + // Initialize the database handler. + val domainsDatabaseHelper = DomainsDatabaseHelper(requireContext()) // Update the SSL certificate if it is pinned. if (nestedScrollWebView.hasPinnedSslCertificate()) { @@ -163,7 +158,7 @@ class PinnedMismatchDialog : DialogFragment() { } // Update the IP addresses if they are pinned. - if (nestedScrollWebView.hasPinnedIpAddresses()) { + if (nestedScrollWebView.pinnedIpAddresses != "") { // Update the pinned IP addresses in the domain database. domainsDatabaseHelper.updatePinnedIpAddresses(nestedScrollWebView.domainSettingsDatabaseId, nestedScrollWebView. currentIpAddresses) @@ -186,14 +181,14 @@ class PinnedMismatchDialog : DialogFragment() { // Set the proceed button listener. dialogBuilder.setPositiveButton(R.string.proceed) { _: DialogInterface?, _: Int -> // Do not check the pinned information for this domain again until the domain changes. - nestedScrollWebView.setIgnorePinnedDomainInformation(true) + nestedScrollWebView.ignorePinnedDomainInformation = true } // Create an alert dialog from the alert dialog builder. val alertDialog = dialogBuilder.create() // 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) @@ -223,4 +218,4 @@ class PinnedMismatchDialog : DialogFragment() { // Return the alert dialog. return alertDialog } -} \ No newline at end of file +}