diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt index 8bf4d4b..175a488 100644 --- a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt +++ b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt @@ -27,12 +27,6 @@ import kotlinx.coroutines.launch import net.typeblog.lpac_jni.impl.PKID_GSMA_LIVE_CI import net.typeblog.lpac_jni.impl.PKID_GSMA_TEST_CI -// https://euicc-manual.osmocom.org/docs/pki/eum/accredited.json -private val RE_SAS = Regex( - """^[A-Z]{2}-[A-Z]{2}(?:-UP)?-\d{4}T?(?:-\d+)?T?$""", - setOf(RegexOption.IGNORE_CASE), -) - class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker { companion object { private val YES_NO = Pair(R.string.yes, R.string.no) @@ -120,8 +114,8 @@ class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker { add(Item(R.string.euicc_info_firmware_version, info.euiccFirmwareVersion.toString())) add(Item(R.string.euicc_info_globalplatform_version, info.globalPlatformVersion.toString())) add(Item(R.string.euicc_info_pp_version, info.ppVersion.toString())) - info.sasAccreditationNumber.trim().takeIf(RE_SAS::matches) - ?.let { add(Item(R.string.euicc_info_sas_accreditation_number, it.uppercase())) } + info.sasAccreditationNumber.trim().takeIf(Regex("^[A-Z]{2}-[A-Z]{2}(-UP)?")::matches) + ?.let { add(Item(R.string.euicc_info_sas_accreditation_number, it)) } add(Item(R.string.euicc_info_free_nvram, info.freeNvram.let(::formatFreeSpace))) } channel.lpa.euiccInfo2?.euiccCiPKIdListForSigning.orEmpty().let { signers ->