Commit 7c00a1ad authored by Kate Glazko's avatar Kate Glazko Committed by Jeff Boek
Browse files

For #5073: View Site Cert

parent 4fec12b1

app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt

+2 −1
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler { 
                title = session.title,

                isSecured = session.securityInfo.secure,

                sitePermissions = sitePermissions,

                gravity = getAppropriateLayoutGravity()

                gravity = getAppropriateLayoutGravity(),

                certificateName = session.securityInfo.issuer

            )

        nav(R.id.browserFragment, directions)

    }

app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ class ExternalAppBrowserFragment : BaseBrowserFragment(), UserInteractionHandler 
                title = session.title,

                isSecured = session.securityInfo.secure,

                sitePermissions = sitePermissions,

                gravity = getAppropriateLayoutGravity()

                gravity = getAppropriateLayoutGravity(),

                certificateName = session.securityInfo.issuer

            )

        nav(R.id.externalAppBrowserFragment, directions)

    }

app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStore.kt

+8 −4
Original line number Diff line number Diff line
@@ -71,18 +71,20 @@ class QuickSettingsFragmentStore( 
         * @param isSecured [Boolean] whether the connection is secured (TLS) or not.

         * @param permissions [SitePermissions]? list of website permissions and their status.

         * @param settings [Settings] application settings.

         * @param certificateName [String] the certificate name of the current web  page.

         */

        @Suppress("LongParameterList")

        fun createStore(

            context: Context,

            websiteUrl: String,

            websiteTitle: String,

            certificateName: String,

            isSecured: Boolean,

            permissions: SitePermissions?,

            settings: Settings

        ) = QuickSettingsFragmentStore(

            QuickSettingsFragmentState(

                webInfoState = createWebsiteInfoState(websiteUrl, websiteTitle, isSecured),

                webInfoState = createWebsiteInfoState(websiteUrl, websiteTitle, isSecured, certificateName),

                websitePermissionsState = createWebsitePermissionState(

                    context,

                    permissions,
@@ -104,13 +106,14 @@ class QuickSettingsFragmentStore( 
        fun createWebsiteInfoState(

            websiteUrl: String,

            websiteTitle: String,

            isSecured: Boolean

            isSecured: Boolean,

            certificateName: String

        ): WebsiteInfoState {

            val (stringRes, iconRes, colorRes) = when (isSecured) {

                true -> getSecuredWebsiteUiValues

                false -> getInsecureWebsiteUiValues

            }

            return WebsiteInfoState(websiteUrl, websiteTitle, stringRes, iconRes, colorRes)

            return WebsiteInfoState(websiteUrl, websiteTitle, stringRes, iconRes, colorRes, certificateName)

        }



        /**
@@ -230,7 +233,8 @@ data class WebsiteInfoState( 
    val websiteTitle: String,

    @StringRes val securityInfoRes: Int,

    @DrawableRes val iconRes: Int,

    @ColorRes val iconTintRes: Int

    @ColorRes val iconTintRes: Int,

    val certificateName: String

) : State



/**

app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ class QuickSettingsSheetDialogFragment : AppCompatDialogFragment() { 
            websiteTitle = args.title,

            isSecured = args.isSecured,

            permissions = args.sitePermissions,

            settings = Settings.getInstance(context)

            settings = Settings.getInstance(context),

            certificateName = args.certificateName

        )



        quickSettingsController = DefaultQuickSettingsController(

app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ class WebsiteInfoView( 
        bindUrl(state.websiteUrl)

        bindTitle(state.websiteTitle)

        bindSecurityInfo(state.securityInfoRes, state.iconRes, state.iconTintRes)

        bindCertificateName(state.certificateName)

    }



    private fun bindUrl(url: String) {
@@ -49,6 +50,11 @@ class WebsiteInfoView( 
        view.title.text = title

    }



    private fun bindCertificateName(cert: String) {

        val certificateLabel = view.context.getString(R.string.verified_by) + " " + cert

        view.certificateInfo.text = certificateLabel

    }



    private fun bindSecurityInfo(

        @StringRes securityInfoRes: Int,

        @DrawableRes iconRes: Int,