From e756555bd078a9624f60fe3278152c31d5563bcc Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Mon, 24 Mar 2025 15:26:53 +0800
Subject: [PATCH 1/3] chore: add more isd-r aids

---
 .../angry/openeuicc/util/PreferenceUtils.kt   | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
index 928079f..5c4dbd1 100644
--- a/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
@@ -45,10 +45,18 @@ const val EUICC_DEFAULT_ISDR_AID = "A0000005591010FFFFFFFF8900000100"
 internal object PreferenceConstants {
     val DEFAULT_AID_LIST = """
         # One AID per line. Comment lines start with #.
+        # Refs: <https://euicc-manual.osmocom.org/docs/lpa/applet-id-oem/>
+
         # eUICC standard
         $EUICC_DEFAULT_ISDR_AID
-        
-        # 5ber
+
+        # eSTK.me
+        A06573746B6D65FFFFFFFF4953442D52
+
+        # eSIM.me
+        A0000005591010000000008900000300
+
+        # 5ber.eSIM
         A0000005591010FFFFFFFF8900050500
     """.trimIndent()
 }
@@ -97,13 +105,12 @@ class PreferenceFlowWrapper<T> private constructor(
         defaultValue: T,
         encoder: (T) -> T,
         decoder: (T) -> T
-    ) :
-            this(
-                context,
-                key,
-                context.dataStore.data.map { it[key]?.let(decoder) ?: defaultValue },
-                encoder
-            )
+    ) : this(
+        context,
+        key,
+        context.dataStore.data.map { it[key]?.let(decoder) ?: defaultValue },
+        encoder
+    )
 
     suspend fun updatePreference(value: T) {
         context.dataStore.edit { it[key] = encoder(value) }
-- 
2.45.3


From 5afcddb378c6c390d68a02380592a13908a3faf7 Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Mon, 24 Mar 2025 16:12:07 +0800
Subject: [PATCH 2/3] chore: add xesim oem supports

---
 .../src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
index 5c4dbd1..5f4aec4 100644
--- a/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
@@ -58,6 +58,9 @@ internal object PreferenceConstants {
 
         # 5ber.eSIM
         A0000005591010FFFFFFFF8900050500
+
+        # Xesim
+        A0000005591010FFFFFFFF8900000177
     """.trimIndent()
 }
 
-- 
2.45.3


From 2adb780879077f0f344b374bb73d896b2f7c9fa5 Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Mon, 24 Mar 2025 16:19:17 +0800
Subject: [PATCH 3/3] use monospace font family

---
 app-common/src/main/res/layout/activity_isdr_aid_list.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-common/src/main/res/layout/activity_isdr_aid_list.xml b/app-common/src/main/res/layout/activity_isdr_aid_list.xml
index 06a75a1..48135fb 100644
--- a/app-common/src/main/res/layout/activity_isdr_aid_list.xml
+++ b/app-common/src/main/res/layout/activity_isdr_aid_list.xml
@@ -11,6 +11,7 @@
         android:id="@+id/isdr_aid_list_editor"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:fontFamily="monospace"
         android:importantForAutofill="no"
         android:inputType="textMultiLine"
         android:gravity="top|start"
-- 
2.45.3