X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FPinnedMismatchDialog.kt;fp=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FPinnedMismatchDialog.kt;h=e80cdc47b31e00b77bf7cc16819f2523f3fb6dff;hp=d4ba4a74d9a8fe1a54378ee891c39f8df180fca2;hb=1d656c562831f535aa33903d44198dd890393f4f;hpb=6ea3e4ebd779594b45ad8f51cc40761bb6d89030 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 d4ba4a74..e80cdc47 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt @@ -19,7 +19,6 @@ package com.stoutner.privacybrowser.dialogs -import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.content.DialogInterface @@ -83,8 +82,6 @@ class PinnedMismatchDialog : DialogFragment() { } } - // `@SuppressLint("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog. - @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the WebView fragment ID. val webViewFragmentId = requireArguments().getLong(WEBVIEW_FRAGMENT_ID) @@ -131,8 +128,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 -> @@ -163,7 +160,7 @@ class PinnedMismatchDialog : DialogFragment() { } // Update the IP addresses if they are pinned. - if (!nestedScrollWebView.pinnedIpAddresses.equals("")) { + if (nestedScrollWebView.pinnedIpAddresses != "") { // Update the pinned IP addresses in the domain database. domainsDatabaseHelper.updatePinnedIpAddresses(nestedScrollWebView.domainSettingsDatabaseId, nestedScrollWebView. currentIpAddresses)