Skip to content

Add support for USB-connected NFC readers in the Multipaz library. #1561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidz25 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for USB-connected NFC readers in the Multipaz library. #1561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
208 changes: 50 additions & 158 deletions ...az-compose/src/commonMain/kotlin/org/multipaz/compose/certificateviewer/X509CertViewer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,24 @@
package org.multipaz.compose.certificateviewer

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.dropShadow
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.shadow.Shadow
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.unit.DpOffset
import androidx.compose.ui.unit.dp
import kotlin.time.Clock
import org.jetbrains.compose.resources.StringResource
import org.jetbrains.compose.resources.stringResource
import org.multipaz.asn1.OID
import org.multipaz.compose.datetime.durationFromNowText
import org.multipaz.compose.datetime.formattedDateTime
import org.multipaz.compose.items.Item
import org.multipaz.compose.items.ItemList
import org.multipaz.crypto.X509Cert
import org.multipaz.datetime.FormatStyle
import org.multipaz.multipaz_compose.generated.resources.Res
Expand Down Expand Up @@ -66,6 +50,7 @@ import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_vali
import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_validity_in_the_past
import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_value
import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_version_text
import kotlin.time.Clock

/**
* Shows a X.509 certificate.
Expand All @@ -92,21 +77,21 @@ fun X509CertViewer(

@Composable
private fun BasicInfo(data: CertificateViewData) {
val sections = mutableListOf<@Composable () -> Unit>()
sections.add {
KeyValuePairLine(
val items = mutableListOf<@Composable () -> Unit>()
items.add {
Item(
stringResource(Res.string.certificate_viewer_k_type),
stringResource(Res.string.certificate_viewer_version_text, data.version)
)
}
sections.add {
KeyValuePairLine(
items.add {
Item(
stringResource(Res.string.certificate_viewer_k_serial_number),
data.serialNumber
)
}
sections.add {
KeyValuePairLine(
items.add {
Item(
stringResource(Res.string.certificate_viewer_k_valid_from),
formattedDateTime(
instant = data.validFrom,
Expand All @@ -115,8 +100,8 @@ private fun BasicInfo(data: CertificateViewData) {
)
)
}
sections.add {
KeyValuePairLine(
items.add {
Item(
stringResource(Res.string.certificate_viewer_k_valid_until),
formattedDateTime(
instant = data.validUntil,
Expand All @@ -128,8 +113,8 @@ private fun BasicInfo(data: CertificateViewData) {

val now = Clock.System.now()
if (now > data.validUntil) {
sections.add {
KeyValuePairLine(
items.add {
Item(
"Validity Info",
buildAnnotatedString {
withStyle(style = SpanStyle(color = MaterialTheme.colorScheme.error)) {
Expand All @@ -144,8 +129,8 @@ private fun BasicInfo(data: CertificateViewData) {
)
}
} else if (data.validFrom > now) {
sections.add {
KeyValuePairLine(
items.add {
Item(
"Validity Info",
buildAnnotatedString {
withStyle(style = SpanStyle(color = MaterialTheme.colorScheme.error)) {
Expand All @@ -160,8 +145,8 @@ private fun BasicInfo(data: CertificateViewData) {
)
}
} else {
sections.add {
KeyValuePairLine(
items.add {
Item(
"Validity Info",
stringResource(
Res.string.certificate_viewer_valid_now,
Expand All @@ -173,7 +158,7 @@ private fun BasicInfo(data: CertificateViewData) {

@Suppress("DEPRECATION")
val clipboardManager = LocalClipboardManager.current
RenderSection(
ItemList(
// Little bit of an easter-egg but very useful: Copy the PEM-encoded certificate
// to the clipboard when user taps the "Basic Information" string.
//
Expand All @@ -183,209 +168,116 @@ private fun BasicInfo(data: CertificateViewData) {
clipboardManager.setText(AnnotatedString(data.pem))
},
title = stringResource(Res.string.certificate_viewer_sub_basic_info),
sections = sections,
items = items,
)
}

@Composable
private fun Subject(data: CertificateViewData) {
if (data.subject.isEmpty()) return

val sections = mutableListOf<@Composable () -> Unit>()
val items = mutableListOf<@Composable () -> Unit>()
data.subject.forEach { (oid, value) ->
val res = oidToResourceMap[oid]
if (res != null) {
sections.add {
KeyValuePairLine(stringResource(res), value)
items.add {
Item(stringResource(res), value)
}
} else {
sections.add {
KeyValuePairLine(stringResource(Res.string.certificate_viewer_k_other_name, oid), value)
items.add {
Item(stringResource(Res.string.certificate_viewer_k_other_name, oid), value)
}
}
}
RenderSection(
ItemList(
title = stringResource(Res.string.certificate_viewer_sub_subject),
sections = sections
items = items
)
}

@Composable
private fun Issuer(data: CertificateViewData) {
if (data.issuer.isEmpty()) return

val sections = mutableListOf<@Composable () -> Unit>()
val items = mutableListOf<@Composable () -> Unit>()
data.issuer.forEach { (oid, value) ->
val res = oidToResourceMap[oid]
if (res != null) {
sections.add {
KeyValuePairLine(stringResource(res), value)
items.add {
Item(stringResource(res), value)
}
} else {
sections.add {
KeyValuePairLine(stringResource(Res.string.certificate_viewer_k_other_name, oid), value)
items.add {
Item(stringResource(Res.string.certificate_viewer_k_other_name, oid), value)
}
}
}
RenderSection(
ItemList(
title = stringResource(Res.string.certificate_viewer_sub_issuer),
sections = sections
items = items
)
}

@Composable
private fun PublicKeyInfo(data: CertificateViewData) {
val sections = mutableListOf<@Composable () -> Unit>()
sections.add {
KeyValuePairLine(
val items = mutableListOf<@Composable () -> Unit>()
items.add {
Item(
stringResource(Res.string.certificate_viewer_k_pk_algorithm),
data.pkAlgorithm
)
}
if (data.pkNamedCurve != null) {
sections.add {
KeyValuePairLine(
items.add {
Item(
stringResource(Res.string.certificate_viewer_k_pk_named_curve),
data.pkNamedCurve
)
}
}
sections.add {
KeyValuePairLine(
items.add {
Item(
stringResource(Res.string.certificate_viewer_k_pk_value),
data.pkValue
)
}
RenderSection(
ItemList(
title = stringResource(Res.string.certificate_viewer_sub_public_key_info),
sections = sections
items = items
)
}

@Composable
private fun Extensions(data: CertificateViewData) {
if (data.extensions.isEmpty()) return

val sections = mutableListOf<@Composable () -> Unit>()
val items = mutableListOf<@Composable () -> Unit>()
data.extensions.forEach { (isCritical, oid, value) ->
sections.add {
KeyValuePairLine(
items.add {
Item(
stringResource(Res.string.certificate_viewer_critical),
if (isCritical) {
stringResource(Res.string.certificate_viewer_critical_yes)
} else {
stringResource(Res.string.certificate_viewer_critical_no)
}
)
KeyValuePairLine(
Item(
stringResource(Res.string.certificate_viewer_oid),
oid
)
KeyValuePairLine(
Item(
stringResource(Res.string.certificate_viewer_value),
value
)
}
}
RenderSection(
ItemList(
title = stringResource(Res.string.certificate_viewer_sub_extensions),
sections = sections
items = items
)
}

@Composable
private fun RenderSection(
modifier: Modifier = Modifier,
sections: List<@Composable () -> Unit>,
title: String,
) {
Text(
modifier = modifier.padding(start = 15.dp, top = 15.dp, end = 15.dp, bottom = 0.dp),
text = title,
style = MaterialTheme.typography.bodyMedium,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.secondary,
)

Column(
modifier = Modifier
.padding(15.dp)
.dropShadow(
shape = RoundedCornerShape(16.dp),
shadow = Shadow(
radius = 10.dp,
spread = 5.dp,
color = Color.Black.copy(alpha = 0.05f),
offset = DpOffset(x = 0.dp, 2.dp)
)
),
) {
for (n in sections.indices) {
val section = sections[n]
val isFirst = (n == 0)
val isLast = (n == sections.size - 1)
val rounded = 16.dp
val firstRounded = if (isFirst) rounded else 0.dp
val endRound = if (isLast) rounded else 0.dp
Column(
modifier = modifier
.fillMaxWidth()
.clip(shape = RoundedCornerShape(firstRounded, firstRounded, endRound, endRound))
.background(MaterialTheme.colorScheme.surfaceContainerLowest)
.padding(8.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
CompositionLocalProvider(
LocalContentColor provides MaterialTheme.colorScheme.onSurface
) {
section()
}
}
if (!isLast) {
Spacer(modifier = Modifier.height(1.dp))
}
}
}
}

@Composable
private fun KeyValuePairLine(
key: String,
valueText: AnnotatedString,
) {
if (valueText.isEmpty()) {
return
}

Column(
Modifier.fillMaxWidth().padding(8.dp)
) {
Text(
text = key,
style = MaterialTheme.typography.bodyMedium,
fontWeight = FontWeight.Bold
)
SelectionContainer {
Text(
text = valueText,
style = MaterialTheme.typography.bodyMedium
)
}
}
}


@Composable
private fun KeyValuePairLine(
key: String,
valueText: String,
) {
if (valueText.isEmpty()) {
return
}
return KeyValuePairLine(key, AnnotatedString(valueText))
}

private val oidToResourceMap: Map<String, StringResource> by lazy {
mapOf(
OID.COMMON_NAME.oid to Res.string.certificate_viewer_k_common_name,
Expand Down
Loading