X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FCheckPinnedMismatchHelper.kt;h=8926f289c94c5e5df1aeb3c86e9951a03366430d;hb=c2b5bdf009503f6761dc830fb65502ad2910c284;hp=8fa8369fc365e0ae192d60655e6c8a948c662888;hpb=38919c77d15eeacbee96ab337afc62b30ddc74ca;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/CheckPinnedMismatchHelper.kt b/app/src/main/java/com/stoutner/privacybrowser/helpers/CheckPinnedMismatchHelper.kt index 8fa8369f..8926f289 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/helpers/CheckPinnedMismatchHelper.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/CheckPinnedMismatchHelper.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2018-2019,2021-2022 Soren Stoutner . + * Copyright 2018-2019,2021-2022 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -16,16 +16,14 @@ * You should have received a copy of the GNU General Public License * along with Privacy Browser Android. If not, see . */ -package com.stoutner.privacybrowser.helpers -import android.app.Activity +package com.stoutner.privacybrowser.helpers import androidx.fragment.app.DialogFragment import androidx.fragment.app.FragmentManager -import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.activities.MainWebViewActivity -import com.stoutner.privacybrowser.dataclasses.PendingDialog +import com.stoutner.privacybrowser.dataclasses.PendingDialogDataClass import com.stoutner.privacybrowser.dialogs.PinnedMismatchDialog.Companion.displayDialog import com.stoutner.privacybrowser.views.NestedScrollWebView @@ -35,7 +33,7 @@ import java.util.Date object CheckPinnedMismatchHelper { @JvmStatic - fun checkPinnedMismatch(activity: Activity, fragmentManager: FragmentManager, nestedScrollWebView: NestedScrollWebView) { + fun checkPinnedMismatch(nestedScrollWebView: NestedScrollWebView, supportFragmentManager: FragmentManager, pinnedMismatchString: String) { // Initialize the current SSL certificate variables. var currentWebsiteIssuedToCName = "" var currentWebsiteIssuedToOName = "" @@ -126,11 +124,11 @@ object CheckPinnedMismatchHelper { // Try to show the dialog. Sometimes the window is not active. try { // Show the pinned mismatch alert dialog. - pinnedMismatchDialogFragment.show(fragmentManager, activity.getString(R.string.pinned_mismatch)) + pinnedMismatchDialogFragment.show(supportFragmentManager, pinnedMismatchString) } catch (exception: Exception) { // Add the dialog to the pending dialog array list. It will be displayed in `onStart()`. - MainWebViewActivity.pendingDialogsArrayList.add(PendingDialog(pinnedMismatchDialogFragment, activity.getString(R.string.pinned_mismatch))) + MainWebViewActivity.pendingDialogsArrayList.add(PendingDialogDataClass(pinnedMismatchDialogFragment, pinnedMismatchString)) } } } -} \ No newline at end of file +}