PeterCxy/OpenEUICC
17
31
Fork 22
Code Issues 6 Pull requests 2 Projects Releases 8 Wiki Activity Actions

WIP: refactor: euicc vendor detect #218

Closed
septs wants to merge 1 commit from septs:euicc-vendor-detect into master
pull from: septs:euicc-vendor-detect
merge into: PeterCxy:master
Conversation 0 Commits 1 Files changed 1 +25 -29
1 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
app-common/src/main/java/im/angry/openeuicc/util/Vendors.kt
View file

@ -12,23 +12,16 @@ data class EuiccVendorInfo(
val firmwareVersion: String?, val firmwareVersion: String?,
) )
private val EUICC_VENDORS: Array<EuiccVendor> = arrayOf(EstkMe(), SimLink()) private val EUICC_VENDORS: Array<EuiccVendor> = arrayOf(ESTKme(), SIMLink())
fun EuiccChannel.tryParseEuiccVendorInfo(): EuiccVendorInfo? { fun EuiccChannel.tryParseEuiccVendorInfo() =
EUICC_VENDORS.forEach { vendor -> EUICC_VENDORS.firstNotNullOfOrNull { it.tryParseEuiccVendorInfo(this) }
vendor.tryParseEuiccVendorInfo(this@tryParseEuiccVendorInfo)?.let {
return it
}
}
return null
}
interface EuiccVendor { interface EuiccVendor {
fun tryParseEuiccVendorInfo(channel: EuiccChannel): EuiccVendorInfo? fun tryParseEuiccVendorInfo(channel: EuiccChannel): EuiccVendorInfo?
} }
private class EstkMe : EuiccVendor { private class ESTKme : EuiccVendor {
companion object { companion object {
private val PRODUCT_AID = "A06573746B6D65FFFFFFFFFFFF6D6774".decodeHex() private val PRODUCT_AID = "A06573746B6D65FFFFFFFFFFFF6D6774".decodeHex()
private val PRODUCT_ATR_FPR = "estk.me".encodeToByteArray() private val PRODUCT_ATR_FPR = "estk.me".encodeToByteArray()
@ -75,17 +68,32 @@ private class EstkMe : EuiccVendor {
} }
} }
private class SimLink : EuiccVendor { private class SIMLink : EuiccVendor {
companion object { private val patterns = buildMap {
private val EID_PATTERN = Regex("^89044045(84|21)67274948") put(Regex("^89044045(84|21)67274948"), ::detectBasedKigenSKUName)
} }
override fun tryParseEuiccVendorInfo(channel: EuiccChannel): EuiccVendorInfo? { override fun tryParseEuiccVendorInfo(channel: EuiccChannel): EuiccVendorInfo? {
val eid = channel.lpa.eID val eid = channel.lpa.eID
val version = channel.lpa.euiccInfo2?.euiccFirmwareVersion for ((pattern, detect) in patterns) {
if (version == null || EID_PATTERN.find(eid, 0) == null) return null if (!pattern.matches(eid)) {
continue
}
return EuiccVendorInfo(
skuName = detect(channel) ?: continue,
serialNumber = null,
bootloaderVersion = null,
firmwareVersion = null
)
}
return null
}
private fun detectBasedKigenSKUName(channel: EuiccChannel): String? {
val version = channel.lpa.euiccInfo2?.euiccFirmwareVersion ?: return null
val versionName = when { val versionName = when {
// @formatter:off // @formatter:off
version >= Version(37, 4, 3) -> "v3.2 (beta 1)"
version >= Version(37, 1, 41) -> "v3.1 (beta 1)" version >= Version(37, 1, 41) -> "v3.1 (beta 1)"
version >= Version(36, 18, 5) -> "v3 (final)" version >= Version(36, 18, 5) -> "v3 (final)"
version >= Version(36, 17, 39) -> "v3 (beta)" version >= Version(36, 17, 39) -> "v3 (beta)"
@ -95,18 +103,6 @@ private class SimLink : EuiccVendor {
// @formatter:on // @formatter:on
else -> null else -> null
} }
return if (versionName == null) "9eSIM" else "9eSIM $versionName"
val skuName = if (versionName == null) {
"9eSIM"
} else {
"9eSIM $versionName"
}
return EuiccVendorInfo(
skuName = skuName,
serialNumber = null,
bootloaderVersion = null,
firmwareVersion = null
)
} }
} }