refactor: simplify estkme firmware version (#250)

Similar to the display format of the FW field on an ESTKme card.

![Screenshot_20251111-172138](/attachments/759f8cfe-be01-48b6-9b6a-7e79e3cdc2f4)

Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/250
Co-authored-by: septs <github@septs.pw>
Co-committed-by: septs <github@septs.pw>

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

@@ -117,7 +117,6 @@ class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
             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)) }
             vendorInfo.firmwareVersion?.let { add(Item(R.string.euicc_info_fw_ver, it)) }
-            vendorInfo.bootloaderVersion?.let { add(Item(R.string.euicc_info_bl_ver, it)) }
         }
         channel.lpa.euiccInfo2?.let { info ->
             add(Item(R.string.euicc_info_sgp22_version, info.sgp22Version.toString()))

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

@@ -8,7 +8,6 @@ import net.typeblog.lpac_jni.Version
 data class EuiccVendorInfo(
     val skuName: String? = null,
     val serialNumber: String? = null,
-    val bootloaderVersion: String? = null,
     val firmwareVersion: String? = null,
 )
 
@@ -57,8 +56,11 @@ private class ESTKme : EuiccVendor {
                 EuiccVendorInfo(
                     skuName = invoke(0x03),
                     serialNumber = invoke(0x00),
-                    bootloaderVersion = invoke(0x01),
-                    firmwareVersion = invoke(0x02),
+                    firmwareVersion = run {
+                        val bl = invoke(0x01) // bootloader version
+                        val fw = invoke(0x02) // firmware version
+                        if (bl == null || fw == null) null else "$bl-$fw"
+                    },
                 )
             }
         } catch (e: Exception) {

app-common/src/main/res/values-ja/strings.xml

@@ -131,7 +131,6 @@
     <string name="euicc_info_removable">リムーバブル</string>
     <string name="euicc_info_sku">製品名</string>
     <string name="euicc_info_sn">製品シリアル番号</string>
-    <string name="euicc_info_bl_ver">製品ブートローダーバージョン</string>
     <string name="euicc_info_fw_ver">製品ファームウェアバージョン</string>
     <string name="euicc_info_sgp22_version">SGP.22 バージョン</string>
     <string name="euicc_info_sas_accreditation_number">SAS 認定番号</string>

app-common/src/main/res/values-zh-rCN/strings.xml

@@ -41,7 +41,6 @@
     <string name="toast_sn_copied">已复制序列号到剪贴板</string>
     <string name="euicc_info_sku">产品名称</string>
     <string name="euicc_info_sn">产品序列号</string>
-    <string name="euicc_info_bl_ver">产品 Bootloader 版本</string>
     <string name="euicc_info_fw_ver">产品固件版本</string>
     <string name="profile_download_confirmation_code_required">确认码 (必需)</string>
     <string name="profile_download_imei">IMEI (可选)</string>

app-common/src/main/res/values-zh-rTW/strings.xml

@@ -41,7 +41,6 @@
     <string name="toast_sn_copied">已複製序號到剪貼簿</string>
     <string name="euicc_info_sku">產品名稱</string>
     <string name="euicc_info_sn">產品序號</string>
-    <string name="euicc_info_bl_ver">產品開機引導版本</string>
     <string name="euicc_info_fw_ver">產品韌體版本</string>
     <string name="profile_download_confirmation_code_required">確認碼 (必需)</string>
     <string name="profile_download_imei">IMEI (可選)</string>

app-common/src/main/res/values/strings.xml

@@ -156,7 +156,6 @@
     <string name="euicc_info_removable">Removable</string>
     <string name="euicc_info_sku">Product Name</string>
     <string name="euicc_info_sn">Product Serial Number</string>
-    <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>