From 95fcbcb9338f758a67e4ff8fdb6ab7c7460aaa78 Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Tue, 25 Feb 2025 12:14:37 +0800
Subject: [PATCH] fix: i18n strings

---
 .../src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt  | 1 -
 .../src/main/java/im/angry/openeuicc/vendored/estkme.kt       | 2 --
 .../java/im/angry/openeuicc/vendored/{nine.kt => simlink.kt}  | 0
 app-common/src/main/res/values/strings.xml                    | 4 ++--
 4 files changed, 2 insertions(+), 5 deletions(-)
 rename app-common/src/main/java/im/angry/openeuicc/vendored/{nine.kt => simlink.kt} (100%)

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 cf64094..d542420 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
@@ -23,7 +23,6 @@ import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.*
-import im.angry.openeuicc.vendored.ESTKmeInfo
 import im.angry.openeuicc.vendored.getESTKmeInfo
 import im.angry.openeuicc.vendored.getNineVersion
 import kotlinx.coroutines.launch
diff --git a/app-common/src/main/java/im/angry/openeuicc/vendored/estkme.kt b/app-common/src/main/java/im/angry/openeuicc/vendored/estkme.kt
index 8c06706..4fd0d61 100644
--- a/app-common/src/main/java/im/angry/openeuicc/vendored/estkme.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/vendored/estkme.kt
@@ -32,8 +32,6 @@ fun getESTKmeInfo(iface: ApduInterface): ESTKmeInfo? {
     } catch (e: Exception) {
         Log.d("ESTKme", "Failed to get ESTKme info", e)
         null
-    } finally {
-        iface.disconnect()
     }
 }
 
diff --git a/app-common/src/main/java/im/angry/openeuicc/vendored/nine.kt b/app-common/src/main/java/im/angry/openeuicc/vendored/simlink.kt
similarity index 100%
rename from app-common/src/main/java/im/angry/openeuicc/vendored/nine.kt
rename to app-common/src/main/java/im/angry/openeuicc/vendored/simlink.kt
diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml
index 5a8063c..f51c177 100644
--- a/app-common/src/main/res/values/strings.xml
+++ b/app-common/src/main/res/values/strings.xml
@@ -127,8 +127,8 @@
     <string name="euicc_info_removable">Removable</string>
     <string name="euicc_info_sku">Product Name</string>
     <string name="euicc_info_sn">Serial Number</string>
-    <string name="euicc_info_fw_ver">Firmware Number</string>
-    <string name="euicc_info_bl_ver">Bootloader Number</string>
+    <string name="euicc_info_bl_ver">Bootloader Version</string>
+    <string name="euicc_info_fw_ver">Firmware Version</string>
     <string name="euicc_info_eid" translatable="false">EID</string>
     <string name="euicc_info_sgp22_version">SGP.22 Version</string>
     <string name="euicc_info_firmware_version">eUICC OS Version</string>