浏览代码

Expose the current ISD-R AID in use

Peter Cai 10 月之前
父节点
当前提交
68114fa863

+ 5 - 0
app-common/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt

@@ -34,5 +34,10 @@ interface EuiccChannel {
      */
     val apduInterface: ApduInterface
 
+    /**
+     * The AID of the ISD-R channel currently in use
+     */
+    val isdrAid: ByteArray
+
     fun close()
 }

+ 1 - 1
app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelImpl.kt

@@ -13,7 +13,7 @@ class EuiccChannelImpl(
     override val port: UiccPortInfoCompat,
     override val intrinsicChannelName: String?,
     override val apduInterface: ApduInterface,
-    isdrAid: ByteArray,
+    override val isdrAid: ByteArray,
     verboseLoggingFlow: Flow<Boolean>,
     ignoreTLSCertificateFlow: Flow<Boolean>
 ) : EuiccChannel {

+ 2 - 0
app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelWrapper.kt

@@ -38,6 +38,8 @@ class EuiccChannelWrapper(orig: EuiccChannel) : EuiccChannel {
         get() = channel.apduInterface
     override val atr: ByteArray?
         get() = channel.atr
+    override val isdrAid: ByteArray
+        get() = channel.isdrAid
 
     override fun close() = channel.close()
 

+ 1 - 0
app-common/src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt

@@ -102,6 +102,7 @@ class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
         add(Item(R.string.euicc_info_access_mode, channel.type))
         add(Item(R.string.euicc_info_removable, formatByBoolean(channel.port.card.isRemovable, YES_NO)))
         add(Item(R.string.euicc_info_eid, channel.lpa.eID, copiedToastResId = R.string.toast_eid_copied))
+        add(Item(R.string.euicc_info_isdr_aid, channel.isdrAid.encodeHex()))
         channel.tryParseEuiccVendorInfo()?.let { vendorInfo ->
             vendorInfo.skuName?.let { add(Item(R.string.euicc_info_sku, it)) }
             vendorInfo.serialNumber?.let { add(Item(R.string.euicc_info_sn, it, copiedToastResId = R.string.toast_sn_copied)) }

+ 1 - 0
app-common/src/main/res/values/strings.xml

@@ -134,6 +134,7 @@
     <string name="euicc_info_bl_ver">Product Bootloader Version</string>
     <string name="euicc_info_fw_ver">Product Firmware Version</string>
     <string name="euicc_info_eid" translatable="false">EID</string>
+    <string name="euicc_info_isdr_aid" translatable="false">ISD-R AID</string>
     <string name="euicc_info_sgp22_version">SGP.22 Version</string>
     <string name="euicc_info_firmware_version">eUICC OS Version</string>
     <string name="euicc_info_globalplatform_version">GlobalPlatform Version</string>