From 4b737a6988d90b6251981a1a90fa177a1978f28e Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Wed, 16 Jul 2025 01:31:06 +0800
Subject: [PATCH 01/19] feat: simplified error handling

---
 .../ui/wizard/SimplifiedErrorHandling.kt      | 145 ++++++++++++++++++
 app-common/src/main/res/values/strings.xml    |  20 +++
 2 files changed, 165 insertions(+)
 create mode 100644 app-common/src/main/java/im/angry/openeuicc/ui/wizard/SimplifiedErrorHandling.kt

diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/SimplifiedErrorHandling.kt b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/SimplifiedErrorHandling.kt
new file mode 100644
index 0000000..14a4f57
--- /dev/null
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/SimplifiedErrorHandling.kt
@@ -0,0 +1,145 @@
+package im.angry.openeuicc.ui.wizard
+
+import androidx.annotation.StringRes
+import im.angry.openeuicc.common.R
+import net.typeblog.lpac_jni.LocalProfileAssistant
+import org.json.JSONObject
+import java.net.NoRouteToHostException
+import java.net.PortUnreachableException
+import java.net.SocketException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import javax.net.ssl.SSLException
+
+object SimplifiedErrorHandling {
+    enum class ErrorCode(@StringRes val titleResId: Int, @StringRes val suggestResId: Int?) {
+        ICCIDAlready(
+            R.string.download_wizard_error_iccid_already,
+            R.string.download_wizard_error_suggest_profile_installed
+        ),
+        InsufficientMemory(
+            R.string.download_wizard_error_insufficient_memory,
+            R.string.download_wizard_error_suggest_insufficient_memory
+        ),
+        UnsupportedProfile(
+            R.string.download_wizard_error_unsupported_profile,
+            null
+        ),
+        CardInternalError(
+            R.string.download_wizard_error_card_internal_error,
+            null
+        ),
+        EIDMismatch(
+            R.string.download_wizard_error_eid_mismatch,
+            R.string.download_wizard_error_suggest_contact_reissue
+        ),
+        UnreleasedProfile(
+            R.string.download_wizard_error_profile_unreleased,
+            R.string.download_wizard_error_suggest_contact_reissue
+        ),
+        MatchingIDRefused(
+            R.string.download_wizard_error_matching_id_refused,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        ProfileRetriesExceeded(
+            R.string.download_wizard_error_profile_retries_exceeded,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        ConfirmationCodeMissing(
+            R.string.download_wizard_error_confirmation_code_missing,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        ConfirmationCodeRefused(
+            R.string.download_wizard_error_confirmation_code_refused,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        ConfirmationCodeRetriesExceeded(
+            R.string.download_wizard_error_confirmation_code_retries_exceeded,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        ProfileExpired(
+            R.string.download_wizard_error_profile_expired,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        UnknownHost(
+            R.string.download_wizard_error_unknown_hostname,
+            null
+        ),
+        NetworkUnreachable(
+            R.string.download_wizard_error_network_unreachable,
+            R.string.download_wizard_error_suggest_network_unreachable
+        ),
+        TLSError(
+            R.string.download_wizard_error_tls_certificate,
+            null
+        )
+    }
+
+    private val httpErrors = buildMap {
+        // Stage: AuthenticateClient
+        put("8.1" to "4.8", ErrorCode.InsufficientMemory)
+        put("8.1.1" to "3.8", ErrorCode.EIDMismatch)
+        put("8.2" to "1.2", ErrorCode.UnreleasedProfile)
+        put("8.2.6" to "3.8", ErrorCode.MatchingIDRefused)
+        put("8.8.5" to "6.4", ErrorCode.ProfileRetriesExceeded)
+
+        // Stage: GetBoundProfilePackage
+        put("8.2.7" to "2.2", ErrorCode.ConfirmationCodeMissing)
+        put("8.2.7" to "3.8", ErrorCode.ConfirmationCodeRefused)
+        put("8.2.7" to "6.4", ErrorCode.ConfirmationCodeRetriesExceeded)
+
+        // Stage: AuthenticateClient, GetBoundProfilePackage
+        put("8.8.5" to "4.10", ErrorCode.ProfileExpired)
+    }
+
+    fun toSimplifiedDownloadError(exc: LocalProfileAssistant.ProfileDownloadException) = when {
+        exc.lpaErrorReason != "ES10B_ERROR_REASON_UNDEFINED" -> toSimplifiedLPAErrorReason(exc.lpaErrorReason)
+        exc.lastHttpResponse?.rcode == 200 -> toSimplifiedHTTPResponse(exc.lastHttpResponse!!)
+        exc.lastHttpException != null -> toSimplifiedHTTPException(exc.lastHttpException!!)
+        exc.lastApduResponse != null -> toSimplifiedAPDUResponse(exc.lastApduResponse!!)
+        else -> null
+    }
+
+    private fun toSimplifiedLPAErrorReason(reason: String) = when (reason) {
+        "ES10B_ERROR_REASON_UNSUPPORTED_CRT_VALUES" -> ErrorCode.UnsupportedProfile
+        "ES10B_ERROR_REASON_UNSUPPORTED_REMOTE_OPERATION_TYPE" -> ErrorCode.UnsupportedProfile
+        "ES10B_ERROR_REASON_UNSUPPORTED_PROFILE_CLASS" -> ErrorCode.UnsupportedProfile
+        "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_ICCID_ALREADY_EXISTS_ON_EUICC" -> ErrorCode.ICCIDAlready
+        "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_INSUFFICIENT_MEMORY_FOR_PROFILE" -> ErrorCode.InsufficientMemory
+        "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_INTERRUPTION" -> ErrorCode.CardInternalError
+        "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_PE_PROCESSING_ERROR" -> ErrorCode.CardInternalError
+        else -> null
+    }
+
+    private fun toSimplifiedHTTPResponse(response: net.typeblog.lpac_jni.HttpInterface.HttpResponse): ErrorCode? {
+        if (response.data.first().toInt() != '{'.code) return null
+        val response = JSONObject(response.data.decodeToString())
+        val statusCodeData = response.optJSONObject("header")
+            ?.optJSONObject("functionExecutionStatus")
+            ?.optJSONObject("statusCodeData")
+            ?: return null
+        val subjectCode = statusCodeData.optString("subjectCode")
+        val reasonCode = statusCodeData.optString("reasonCode")
+        return httpErrors[subjectCode to reasonCode]
+    }
+
+    private fun toSimplifiedHTTPException(exc: Exception) = when (exc) {
+        is SSLException -> ErrorCode.TLSError
+        is UnknownHostException -> ErrorCode.UnknownHost
+        is NoRouteToHostException -> ErrorCode.NetworkUnreachable
+        is PortUnreachableException -> ErrorCode.NetworkUnreachable
+        is SocketTimeoutException -> ErrorCode.NetworkUnreachable
+        is SocketException -> exc.message
+            ?.contains("Connection reset", ignoreCase = true)
+            ?.let { if (it) ErrorCode.NetworkUnreachable else null }
+        else -> null
+    }
+
+    private fun toSimplifiedAPDUResponse(resp: ByteArray): ErrorCode? {
+        val isSuccess = resp.size >= 2 &&
+                resp[resp.size - 2] == 0x90.toByte() &&
+                resp[resp.size - 1] == 0x00.toByte()
+        if (isSuccess) return null
+        return ErrorCode.CardInternalError
+    }
+}
diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml
index 38bb976..45ec3a7 100644
--- a/app-common/src/main/res/values/strings.xml
+++ b/app-common/src/main/res/values/strings.xml
@@ -102,6 +102,26 @@
     <string name="download_wizard_diagnostics_last_apdu_exception">Last APDU exception:</string>
     <string name="download_wizard_diagnostics_save">Save</string>
     <string name="download_wizard_diagnostics_file_template">Diagnostics at %s</string>
+    <string name="download_wizard_error_iccid_already">This eSIM profile is installed, Cannot be reinstalled.</string>
+    <string name="download_wizard_error_insufficient_memory">Sorry, The remaining capacity of this eSIM chip cannot be used to install this eSIM profile.</string>
+    <string name="download_wizard_error_unsupported_profile">Sorry, This eSIM profile is unsupported.</string>
+    <string name="download_wizard_error_card_internal_error">An error occurred inside the card.</string>
+    <string name="download_wizard_error_eid_mismatch">This eSIM profile has been installed on another device.</string>
+    <string name="download_wizard_error_profile_unreleased">This eSIM profile has been unreleased.</string>
+    <string name="download_wizard_error_matching_id_refused">This eSIM activation code is invalid.</string>
+    <string name="download_wizard_error_profile_retries_exceeded">The maximum number of retries for the eSIM profile has been exceeded.</string>
+    <string name="download_wizard_error_confirmation_code_missing">Please enter the confirmation code to continue.</string>
+    <string name="download_wizard_error_confirmation_code_refused">The confirmation code you entered is invalid.</string>
+    <string name="download_wizard_error_profile_expired">This eSIM profile has been expired.</string>
+    <string name="download_wizard_error_confirmation_code_retries_exceeded">The maximum number of retries for the Confirmation Code has been exceeded.</string>
+    <string name="download_wizard_error_unknown_hostname">Unknown SM-DP+ address</string>
+    <string name="download_wizard_error_network_unreachable">The current network is unreachable</string>
+    <string name="download_wizard_error_tls_certificate">TLS certificate error, this eSIM profile is not supported</string>
+    <string name="download_wizard_error_suggest_profile_installed">You are trying to reinstall an already installed eSIM profile</string>
+    <string name="download_wizard_error_suggest_insufficient_memory">Please delete an eSIM profile and try again</string>
+    <string name="download_wizard_error_suggest_contact_carrier">Please contact your carrier for assistance.</string>
+    <string name="download_wizard_error_suggest_contact_reissue">Please contact your carrier to reissue this eSIM profile.</string>
+    <string name="download_wizard_error_suggest_network_unreachable">The current network is unavailable. Please try again after changing the network.</string>
 
     <string name="logs_saved_message">Logs have been saved to the selected path. Would you like to share the log through another app?</string>
 

From 677b69cedfcae37557ca5626bb1741987ffb0a10 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 10:29:27 -0400
Subject: [PATCH 02/19] feat: quick compatibility check

Co-authored-by: septs <github@septs.pw>
---
 app-unpriv/src/main/AndroidManifest.xml       |   5 +
 .../openeuicc/di/UnprivilegedAppContainer.kt  |   5 +
 .../di/UnprivilegedUiComponentFactory.kt      |   7 +-
 .../ui/QuickCompatibilityActivity.kt          |  25 ++++
 .../ui/QuickCompatibilityFragment.kt          | 140 ++++++++++++++++++
 .../openeuicc/ui/UnprivilegedMainActivity.kt  |  13 +-
 .../openeuicc/util/CompatibilityCheck.kt      |   6 +-
 .../util/UnprivilegedPreferenceRepository.kt  |  14 ++
 .../angry/openeuicc/util/UnprivilegedUtils.kt |   6 +
 .../layout/activity_quick_compatibility.xml   |  16 ++
 .../layout/fragment_quick_compatibility.xml   |  53 +++++++
 app-unpriv/src/main/res/values/strings.xml    |  10 ++
 12 files changed, 294 insertions(+), 6 deletions(-)
 create mode 100644 app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt
 create mode 100644 app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
 create mode 100644 app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedPreferenceRepository.kt
 create mode 100644 app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedUtils.kt
 create mode 100644 app-unpriv/src/main/res/layout/activity_quick_compatibility.xml
 create mode 100644 app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml

diff --git a/app-unpriv/src/main/AndroidManifest.xml b/app-unpriv/src/main/AndroidManifest.xml
index ce985cd..ba37079 100644
--- a/app-unpriv/src/main/AndroidManifest.xml
+++ b/app-unpriv/src/main/AndroidManifest.xml
@@ -23,6 +23,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="im.angry.openeuicc.ui.QuickCompatibilityActivity"
+            android:exported="false"
+            android:label="@string/quick_compatibility" />
+
         <activity
             android:name="im.angry.openeuicc.ui.CompatibilityCheckActivity"
             android:exported="false"
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt
index 4dbfe41..042c720 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt
@@ -1,6 +1,7 @@
 package im.angry.openeuicc.di
 
 import android.content.Context
+import im.angry.openeuicc.util.UnprivilegedPreferenceRepository
 
 class UnprivilegedAppContainer(context: Context) : DefaultAppContainer(context) {
     override val uiComponentFactory by lazy {
@@ -10,4 +11,8 @@ class UnprivilegedAppContainer(context: Context) : DefaultAppContainer(context)
     override val customizableTextProvider by lazy {
         UnprivilegedCustomizableTextProvider(context)
     }
+
+    override val preferenceRepository by lazy {
+        UnprivilegedPreferenceRepository(context)
+    }
 }
\ No newline at end of file
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt
index 06c489c..73f33d1 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt
@@ -2,12 +2,12 @@ package im.angry.openeuicc.di
 
 import androidx.fragment.app.Fragment
 import im.angry.openeuicc.ui.EuiccManagementFragment
-import im.angry.openeuicc.ui.SettingsFragment
+import im.angry.openeuicc.ui.QuickCompatibilityFragment
 import im.angry.openeuicc.ui.UnprivilegedEuiccManagementFragment
 import im.angry.openeuicc.ui.UnprivilegedNoEuiccPlaceholderFragment
 import im.angry.openeuicc.ui.UnprivilegedSettingsFragment
 
-class UnprivilegedUiComponentFactory : DefaultUiComponentFactory() {
+open class UnprivilegedUiComponentFactory : DefaultUiComponentFactory() {
     override fun createEuiccManagementFragment(slotId: Int, portId: Int): EuiccManagementFragment =
         UnprivilegedEuiccManagementFragment.newInstance(slotId, portId)
 
@@ -16,4 +16,7 @@ class UnprivilegedUiComponentFactory : DefaultUiComponentFactory() {
 
     override fun createSettingsFragment(): Fragment =
         UnprivilegedSettingsFragment()
+
+    open fun createQuickAvailabilityFragment(): Fragment =
+        QuickCompatibilityFragment()
 }
\ No newline at end of file
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt
new file mode 100644
index 0000000..d83903b
--- /dev/null
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt
@@ -0,0 +1,25 @@
+package im.angry.openeuicc.ui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import im.angry.easyeuicc.R
+import im.angry.openeuicc.di.UnprivilegedUiComponentFactory
+import im.angry.openeuicc.util.OpenEuiccContextMarker
+
+class QuickCompatibilityActivity : AppCompatActivity(), OpenEuiccContextMarker {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContentView(R.layout.activity_quick_compatibility)
+
+        val quickAvailabilityFragment =
+            (appContainer.uiComponentFactory as UnprivilegedUiComponentFactory)
+                .createQuickAvailabilityFragment()
+
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.quick_availability_container, quickAvailabilityFragment)
+            .commit()
+    }
+}
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
new file mode 100644
index 0000000..9086234
--- /dev/null
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
@@ -0,0 +1,140 @@
+package im.angry.openeuicc.ui
+
+import android.content.pm.PackageManager
+import android.icu.text.ListFormatter
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.CheckBox
+import android.widget.TextView
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import im.angry.easyeuicc.R
+import im.angry.openeuicc.util.EUICC_DEFAULT_ISDR_AID
+import im.angry.openeuicc.util.UnprivilegedEuiccContextMarker
+import im.angry.openeuicc.util.connectSEService
+import im.angry.openeuicc.util.decodeHex
+import im.angry.openeuicc.util.isSIM
+import im.angry.openeuicc.util.slotIndex
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+
+open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMarker {
+    companion object {
+        enum class Compatibility {
+            COMPATIBLE,
+            NOT_COMPATIBLE,
+        }
+
+        data class CompatibilityResult(
+            val compatibility: Compatibility,
+            val slots: List<String> = emptyList()
+        )
+    }
+
+    private val conclusion: TextView by lazy {
+        requireView().requireViewById(R.id.quick_availability_conclusion)
+    }
+
+    private val resultSlots: TextView by lazy {
+        requireView().requireViewById(R.id.quick_availability_result_slots)
+    }
+
+    private val resultNotes: TextView by lazy {
+        requireView().requireViewById(R.id.quick_availability_result_notes)
+    }
+
+    private val hidden: CheckBox by lazy {
+        requireView().requireViewById(R.id.quick_availability_hidden)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View = inflater.inflate(R.layout.fragment_quick_compatibility, container, false).apply {
+        requireViewById<TextView>(R.id.quick_availability_device_information)
+            .text = formatDeviceInformation()
+        requireViewById<Button>(R.id.quick_availability_button_continue)
+            .setOnClickListener { onContinueToApp() }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        lifecycleScope.launch {
+            onCompatibilityUpdate(getCompatibilityCheckResult())
+        }
+    }
+
+    private fun onContinueToApp() {
+        runBlocking {
+            preferenceRepository.skipQuickAvailabilityFlow
+                .updatePreference(hidden.isChecked)
+        }
+        requireActivity().finish()
+    }
+
+    private fun onCompatibilityUpdate(result: CompatibilityResult) {
+        conclusion.text = formatConclusion(result)
+        if (result.compatibility != Compatibility.COMPATIBLE) return
+        resultSlots.isVisible = true
+        resultSlots.text = getString(
+            R.string.quick_compatibility_result_slots,
+            ListFormatter.getInstance().format(result.slots)
+        )
+        resultNotes.isVisible = true
+    }
+
+    private suspend fun getCompatibilityCheckResult(): CompatibilityResult {
+        val service = connectSEService(requireContext())
+        if (!service.isConnected) {
+            return CompatibilityResult(Compatibility.NOT_COMPATIBLE)
+        }
+        val slots = service.readers.filter { it.isSIM }.mapNotNull { reader ->
+            try {
+                // Note: we ONLY check the default ISD-R AID, because this test is for the _device_,
+                // NOT the eUICC. We don't care what AID a potential eUICC might use, all we need to
+                // check is we can open _some_ AID.
+                reader.openSession().openLogicalChannel(EUICC_DEFAULT_ISDR_AID.decodeHex())?.close()
+                reader.slotIndex
+            } catch (_: SecurityException) {
+                // Ignore; this is expected when everything works
+                // ref: https://android.googlesource.com/platform/frameworks/base/+/4fe64fb4712a99d5da9c9a0eb8fd5169b252e1e1/omapi/java/android/se/omapi/Session.java#305
+                // SecurityException is only thrown when Channel is constructed, which means everything else needs to succeed
+                reader.slotIndex
+            } catch (_: Exception) {
+                null
+            }
+        }
+        if (slots.isEmpty()) {
+            return CompatibilityResult(Compatibility.NOT_COMPATIBLE)
+        }
+        return CompatibilityResult(Compatibility.COMPATIBLE, slots = slots.map { "SIM$it" })
+    }
+
+    open fun formatConclusion(result: CompatibilityResult): String {
+        val usbHost = requireContext().packageManager
+            .hasSystemFeature(PackageManager.FEATURE_USB_HOST)
+        val resId = when (result.compatibility) {
+            Compatibility.COMPATIBLE ->
+                R.string.quick_compatibility_compatible
+
+            Compatibility.NOT_COMPATIBLE -> if (usbHost)
+                R.string.quick_compatibility_not_compatible_but_usb else
+                R.string.quick_compatibility_not_compatible
+        }
+        return getString(resId, getString(R.string.app_name))
+    }
+
+    open fun formatDeviceInformation() = buildString {
+        appendLine("BRAND: ${Build.BRAND}")
+        appendLine("DEVICE: ${Build.DEVICE}")
+        appendLine("MODEL: ${Build.MODEL}")
+        appendLine("VERSION.RELEASE: ${Build.VERSION.RELEASE}")
+        appendLine("VERSION.SDK_INT: ${Build.VERSION.SDK_INT}")
+    }
+}
\ No newline at end of file
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt
index 1ed0cce..ac20557 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt
@@ -1,11 +1,22 @@
 package im.angry.openeuicc.ui
 
 import android.content.Intent
+import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import im.angry.easyeuicc.R
+import im.angry.openeuicc.util.UnprivilegedEuiccContextMarker
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+
+class UnprivilegedMainActivity : MainActivity(), UnprivilegedEuiccContextMarker {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (runBlocking { !preferenceRepository.skipQuickAvailabilityFlow.first() }) {
+            startActivity(Intent(this, QuickCompatibilityActivity::class.java))
+        }
+    }
 
-class UnprivilegedMainActivity: MainActivity() {
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         super.onCreateOptionsMenu(menu)
         menuInflater.inflate(R.menu.activity_main_unprivileged, menu)
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/util/CompatibilityCheck.kt b/app-unpriv/src/main/java/im/angry/openeuicc/util/CompatibilityCheck.kt
index 94ee9d6..b2b503a 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/util/CompatibilityCheck.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/util/CompatibilityCheck.kt
@@ -33,10 +33,10 @@ suspend fun List<CompatibilityCheck>.executeAll(callback: () -> Unit) = withCont
     }
 }
 
-private val Reader.isSIM: Boolean
+val Reader.isSIM: Boolean
     get() = name.startsWith("SIM")
 
-private val Reader.slotIndex: Int
+val Reader.slotIndex: Int
     get() = (name.replace("SIM", "").toIntOrNull() ?: 1)
 
 abstract class CompatibilityCheck(context: Context) {
@@ -173,7 +173,7 @@ internal class IsdrChannelAccessCheck(private val context: Context): Compatibili
             }
         }
 
-        if (result != State.SUCCESS && validSlotIds.size > 0) {
+        if (result != State.SUCCESS && validSlotIds.isNotEmpty()) {
             if (!context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_EUICC)) {
                 failureDescription = context.getString(
                     R.string.compatibility_check_isdr_channel_desc_partial_fail,
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedPreferenceRepository.kt b/app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedPreferenceRepository.kt
new file mode 100644
index 0000000..193a2fa
--- /dev/null
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedPreferenceRepository.kt
@@ -0,0 +1,14 @@
+package im.angry.openeuicc.util
+
+import android.content.Context
+import androidx.datastore.preferences.core.booleanPreferencesKey
+
+internal object UnprivilegedPreferenceKeys {
+    // ---- Miscellaneous ----
+    val SKIP_QUICK_AVAILABILITY = booleanPreferencesKey("skip_quick_availability")
+}
+
+class UnprivilegedPreferenceRepository(context: Context) : PreferenceRepository(context) {
+    // ---- Miscellaneous ----
+    val skipQuickAvailabilityFlow = bindFlow(UnprivilegedPreferenceKeys.SKIP_QUICK_AVAILABILITY, false)
+}
\ No newline at end of file
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedUtils.kt b/app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedUtils.kt
new file mode 100644
index 0000000..a8b2246
--- /dev/null
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedUtils.kt
@@ -0,0 +1,6 @@
+package im.angry.openeuicc.util
+
+interface UnprivilegedEuiccContextMarker : OpenEuiccContextMarker {
+    override val preferenceRepository: UnprivilegedPreferenceRepository
+        get() = appContainer.preferenceRepository as UnprivilegedPreferenceRepository
+}
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/layout/activity_quick_compatibility.xml b/app-unpriv/src/main/res/layout/activity_quick_compatibility.xml
new file mode 100644
index 0000000..42f3896
--- /dev/null
+++ b/app-unpriv/src/main/res/layout/activity_quick_compatibility.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/quick_availability_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
new file mode 100644
index 0000000..8089c88
--- /dev/null
+++ b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="32dp"
+    android:textAlignment="center">
+
+    <TextView
+        android:id="@+id/quick_availability_conclusion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:textAlignment="center"
+        android:textSize="20sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/quick_availability_device_information"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="monospace"
+        android:lineHeight="30dp"
+        android:textAlignment="center" />
+
+    <TextView
+        android:id="@+id/quick_availability_result_slots"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/quick_availability_result_notes"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/quick_compatibility_result_notes"
+        android:visibility="gone" />
+
+    <CheckBox
+        android:id="@+id/quick_availability_hidden"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/quick_compatibility_hidden" />
+
+    <Button
+        android:id="@+id/quick_availability_button_continue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/quick_compatibility_button_continue" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/values/strings.xml b/app-unpriv/src/main/res/values/strings.xml
index 43bf44f..8530dd0 100644
--- a/app-unpriv/src/main/res/values/strings.xml
+++ b/app-unpriv/src/main/res/values/strings.xml
@@ -11,6 +11,16 @@
     <string name="toast_ara_m_copied">ARA-M SHA-1 copied to clipboard</string>
     <string name="toast_prompt_to_enable_sim_toolkit">Please ENABLE your \"%s\" application</string>
 
+    <!-- Quick Compatibility -->
+    <string name="quick_compatibility">Quick Compatibility Check</string>
+    <string name="quick_compatibility_compatible">Your smartphone can manage %s-compatible cards</string>
+    <string name="quick_compatibility_not_compatible">Your smartphone is not compatible with %s</string>
+    <string name="quick_compatibility_not_compatible_but_usb">Your smartphone is not fully compatible with %s. However, you can still use a USB smart card reader for near-full functionality.</string>
+    <string name="quick_compatibility_result_slots">SIM card slots accessible: %s</string>
+    <string name="quick_compatibility_result_notes">Note: these results are for reference only. Even if a SIM slot is not listed above, it <i>may</i> be compatible as well once a SIM card is inserted.</string>
+    <string name="quick_compatibility_hidden">Do not show this message again.</string>
+    <string name="quick_compatibility_button_continue">Continue</string>
+
     <!-- Compatibility Check Descriptions -->
     <string name="compatibility_check_system_features">System Features</string>
     <string name="compatibility_check_system_features_desc">Whether your device has all the required features for managing removable eUICC cards. For example, basic telephony and OMAPI support.</string>

From cbe3d1fd5004877afe3dfc22045b99d276084e2a Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 10:33:16 -0400
Subject: [PATCH 03/19] Use quick compatibility check as the main method of
 compatibility checks

The old one doesn't really add much for the purpose, fwiw
---
 .../im/angry/openeuicc/ui/QuickCompatibilityFragment.kt    | 7 +------
 .../java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt | 2 +-
 .../src/main/res/layout/fragment_quick_compatibility.xml   | 6 ------
 app-unpriv/src/main/res/values/strings.xml                 | 1 -
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
index 9086234..9b54640 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
@@ -8,7 +8,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
-import android.widget.CheckBox
 import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
@@ -48,10 +47,6 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         requireView().requireViewById(R.id.quick_availability_result_notes)
     }
 
-    private val hidden: CheckBox by lazy {
-        requireView().requireViewById(R.id.quick_availability_hidden)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -73,7 +68,7 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
     private fun onContinueToApp() {
         runBlocking {
             preferenceRepository.skipQuickAvailabilityFlow
-                .updatePreference(hidden.isChecked)
+                .updatePreference(true)
         }
         requireActivity().finish()
     }
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt
index ac20557..da75d6f 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt
@@ -26,7 +26,7 @@ class UnprivilegedMainActivity : MainActivity(), UnprivilegedEuiccContextMarker
     override fun onOptionsItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             R.id.compatibility_check -> {
-                startActivity(Intent(this, CompatibilityCheckActivity::class.java))
+                startActivity(Intent(this, QuickCompatibilityActivity::class.java))
                 true
             }
             else -> super.onOptionsItemSelected(item)
diff --git a/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
index 8089c88..c1b206a 100644
--- a/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
+++ b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
@@ -38,12 +38,6 @@
         android:text="@string/quick_compatibility_result_notes"
         android:visibility="gone" />
 
-    <CheckBox
-        android:id="@+id/quick_availability_hidden"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/quick_compatibility_hidden" />
-
     <Button
         android:id="@+id/quick_availability_button_continue"
         android:layout_width="match_parent"
diff --git a/app-unpriv/src/main/res/values/strings.xml b/app-unpriv/src/main/res/values/strings.xml
index 8530dd0..490b128 100644
--- a/app-unpriv/src/main/res/values/strings.xml
+++ b/app-unpriv/src/main/res/values/strings.xml
@@ -18,7 +18,6 @@
     <string name="quick_compatibility_not_compatible_but_usb">Your smartphone is not fully compatible with %s. However, you can still use a USB smart card reader for near-full functionality.</string>
     <string name="quick_compatibility_result_slots">SIM card slots accessible: %s</string>
     <string name="quick_compatibility_result_notes">Note: these results are for reference only. Even if a SIM slot is not listed above, it <i>may</i> be compatible as well once a SIM card is inserted.</string>
-    <string name="quick_compatibility_hidden">Do not show this message again.</string>
     <string name="quick_compatibility_button_continue">Continue</string>
 
     <!-- Compatibility Check Descriptions -->

From 65775c1d063475c8c26ff97c1b4b322ca30774f7 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 10:37:30 -0400
Subject: [PATCH 04/19] Delete old (and useless) compatibility checks

---
 app-unpriv/src/main/AndroidManifest.xml       |   5 -
 .../ui/CompatibilityCheckActivity.kt          |  95 ------
 .../UnprivilegedNoEuiccPlaceholderFragment.kt |   2 +-
 .../openeuicc/util/CompatibilityCheck.kt      | 280 ------------------
 .../layout/activity_compatibility_check.xml   |  18 --
 app-unpriv/src/main/res/values-ja/strings.xml |  28 --
 .../src/main/res/values-zh-rCN/strings.xml    |  27 --
 .../src/main/res/values-zh-rTW/strings.xml    |  27 --
 app-unpriv/src/main/res/values/strings.xml    |  29 --
 9 files changed, 1 insertion(+), 510 deletions(-)
 delete mode 100644 app-unpriv/src/main/java/im/angry/openeuicc/ui/CompatibilityCheckActivity.kt
 delete mode 100644 app-unpriv/src/main/java/im/angry/openeuicc/util/CompatibilityCheck.kt
 delete mode 100644 app-unpriv/src/main/res/layout/activity_compatibility_check.xml

diff --git a/app-unpriv/src/main/AndroidManifest.xml b/app-unpriv/src/main/AndroidManifest.xml
index ba37079..9c14163 100644
--- a/app-unpriv/src/main/AndroidManifest.xml
+++ b/app-unpriv/src/main/AndroidManifest.xml
@@ -28,11 +28,6 @@
             android:exported="false"
             android:label="@string/quick_compatibility" />
 
-        <activity
-            android:name="im.angry.openeuicc.ui.CompatibilityCheckActivity"
-            android:exported="false"
-            android:label="@string/compatibility_check" />
-
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
             android:enabled="false"
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/CompatibilityCheckActivity.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/CompatibilityCheckActivity.kt
deleted file mode 100644
index 39a360f..0000000
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/CompatibilityCheckActivity.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-package im.angry.openeuicc.ui
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.text.Html
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.children
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import im.angry.easyeuicc.R
-import im.angry.openeuicc.util.*
-import kotlinx.coroutines.launch
-
-class CompatibilityCheckActivity: AppCompatActivity() {
-    private lateinit var compatibilityCheckList: RecyclerView
-    private val compatibilityChecks: List<CompatibilityCheck> by lazy { getCompatibilityChecks(this) }
-    private val adapter = CompatibilityChecksAdapter()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_compatibility_check)
-        setSupportActionBar(requireViewById(im.angry.openeuicc.common.R.id.toolbar))
-        setupToolbarInsets()
-        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
-
-        compatibilityCheckList = requireViewById<RecyclerView>(R.id.recycler_view).also {
-            it.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
-            it.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
-            it.adapter = adapter
-        }
-
-        setupRootViewInsets(compatibilityCheckList)
-    }
-
-    @SuppressLint("NotifyDataSetChanged")
-    override fun onStart() {
-        super.onStart()
-        lifecycleScope.launch {
-            compatibilityChecks.executeAll { adapter.notifyDataSetChanged() }
-        }
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean =
-        when (item.itemId) {
-            android.R.id.home -> {
-                finish()
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-
-    inner class ViewHolder(private val root: View): RecyclerView.ViewHolder(root) {
-        private val titleView: TextView = root.requireViewById(R.id.compatibility_check_title)
-        private val descView: TextView = root.requireViewById(R.id.compatibility_check_desc)
-        private val statusContainer: ViewGroup = root.requireViewById(R.id.compatibility_check_status_container)
-
-        fun bindItem(item: CompatibilityCheck) {
-            titleView.text = item.title
-            descView.text = Html.fromHtml(item.description, Html.FROM_HTML_MODE_COMPACT)
-
-            statusContainer.children.forEach {
-                it.isVisible = false
-            }
-
-            val viewId = when (item.state) {
-                CompatibilityCheck.State.SUCCESS -> R.id.compatibility_check_checkmark
-                CompatibilityCheck.State.FAILURE -> R.id.compatibility_check_error
-                CompatibilityCheck.State.FAILURE_UNKNOWN -> R.id.compatibility_check_unknown
-                else -> R.id.compatibility_check_progress_bar
-            }
-            root.requireViewById<View>(viewId).isVisible = true
-        }
-    }
-
-    inner class CompatibilityChecksAdapter: RecyclerView.Adapter<ViewHolder>() {
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
-            ViewHolder(layoutInflater.inflate(R.layout.compatibility_check_item, parent, false))
-
-        override fun getItemCount(): Int =
-            compatibilityChecks.indexOfLast { it.state != CompatibilityCheck.State.NOT_STARTED } + 1
-
-        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-            holder.bindItem(compatibilityChecks[position])
-        }
-    }
-}
\ No newline at end of file
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedNoEuiccPlaceholderFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedNoEuiccPlaceholderFragment.kt
index 92cda23..56ad690 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedNoEuiccPlaceholderFragment.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedNoEuiccPlaceholderFragment.kt
@@ -21,7 +21,7 @@ class UnprivilegedNoEuiccPlaceholderFragment : Fragment() {
         )
 
         view.findViewById<View>(R.id.compatibility_check).setOnClickListener {
-            startActivity(Intent(requireContext(), CompatibilityCheckActivity::class.java))
+            startActivity(Intent(requireContext(), QuickCompatibilityActivity::class.java))
         }
 
         return view
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/util/CompatibilityCheck.kt b/app-unpriv/src/main/java/im/angry/openeuicc/util/CompatibilityCheck.kt
deleted file mode 100644
index b2b503a..0000000
--- a/app-unpriv/src/main/java/im/angry/openeuicc/util/CompatibilityCheck.kt
+++ /dev/null
@@ -1,280 +0,0 @@
-package im.angry.openeuicc.util
-
-import android.content.Context
-import android.content.pm.PackageManager
-import android.os.Build
-import android.se.omapi.Reader
-import android.telephony.TelephonyManager
-import im.angry.easyeuicc.R
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.withContext
-import java.io.IOException
-
-fun getCompatibilityChecks(context: Context): List<CompatibilityCheck> =
-    listOf(
-        HasSystemFeaturesCheck(context),
-        OmapiConnCheck(context),
-        IsdrChannelAccessCheck(context),
-        KnownBrokenCheck(context),
-        UsbCheck(context),
-        Verdict(context),
-    )
-
-inline fun <reified T: CompatibilityCheck> List<CompatibilityCheck>.findCheck(): T? =
-    find { it.javaClass == T::class.java }?.let { it as T }
-
-suspend fun List<CompatibilityCheck>.executeAll(callback: () -> Unit) = withContext(Dispatchers.IO) {
-    forEach {
-        it.run(this@executeAll)
-        withContext(Dispatchers.Main) {
-            callback()
-        }
-    }
-}
-
-val Reader.isSIM: Boolean
-    get() = name.startsWith("SIM")
-
-val Reader.slotIndex: Int
-    get() = (name.replace("SIM", "").toIntOrNull() ?: 1)
-
-abstract class CompatibilityCheck(context: Context) {
-    enum class State {
-        NOT_STARTED,
-        IN_PROGRESS,
-        SUCCESS,
-        FAILURE_UNKNOWN, // The check technically failed, but no conclusion can be drawn
-        FAILURE
-    }
-
-    var state = State.NOT_STARTED
-
-    abstract val title: String
-    protected abstract val defaultDescription: String
-    protected lateinit var successDescription: String
-    protected lateinit var failureDescription: String
-
-    val description: String
-        get() = when {
-            (state == State.FAILURE || state == State.FAILURE_UNKNOWN) && this::failureDescription.isInitialized -> failureDescription
-            state == State.SUCCESS && this::successDescription.isInitialized -> successDescription
-            else -> defaultDescription
-        }
-
-    protected abstract suspend fun doCheck(allChecks: List<CompatibilityCheck>): State
-
-    suspend fun run(allChecks: List<CompatibilityCheck>) {
-        state = State.IN_PROGRESS
-        delay(200)
-        state = try {
-            doCheck(allChecks)
-        } catch (_: Exception) {
-            State.FAILURE
-        }
-    }
-}
-
-internal class HasSystemFeaturesCheck(private val context: Context): CompatibilityCheck(context) {
-    override val title: String
-        get() = context.getString(R.string.compatibility_check_system_features)
-    override val defaultDescription: String
-        get() = context.getString(R.string.compatibility_check_system_features_desc)
-
-    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State {
-        if (!context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            failureDescription = context.getString(R.string.compatibility_check_system_features_no_telephony)
-            return State.FAILURE
-        }
-
-        // We can check OMAPI UICC availability on R or later (if before R, we check OMAPI connectivity later)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !context.packageManager.hasSystemFeature(
-            PackageManager.FEATURE_SE_OMAPI_UICC
-        )) {
-            failureDescription = context.getString(R.string.compatibility_check_system_features_no_omapi)
-            return State.FAILURE_UNKNOWN
-        }
-
-        return State.SUCCESS
-    }
-}
-
-internal class OmapiConnCheck(private val context: Context): CompatibilityCheck(context) {
-    override val title: String
-        get() = context.getString(R.string.compatibility_check_omapi_connectivity)
-    override val defaultDescription: String
-        get() = context.getString(R.string.compatibility_check_omapi_connectivity_desc)
-
-    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State {
-        val seService = connectSEService(context)
-        if (!seService.isConnected) {
-            failureDescription = context.getString(R.string.compatibility_check_omapi_connectivity_fail)
-            return State.FAILURE
-        }
-
-        val tm = context.getSystemService(TelephonyManager::class.java)
-        val simReaders = seService.readers.filter { it.isSIM }
-        if (simReaders.isEmpty()) {
-            failureDescription = context.getString(R.string.compatibility_check_omapi_connectivity_fail)
-            return State.FAILURE_UNKNOWN
-        } else if (simReaders.size < tm.activeModemCountCompat) {
-            successDescription = context.getString(R.string.compatibility_check_omapi_connectivity_partial_success_sim_number,
-                simReaders.map { it.slotIndex }.joinToString(", "))
-            return State.SUCCESS
-        }
-
-        return State.SUCCESS
-    }
-}
-
-internal class IsdrChannelAccessCheck(private val context: Context): CompatibilityCheck(context) {
-    override val title: String
-        get() = context.getString(R.string.compatibility_check_isdr_channel)
-    override val defaultDescription: String
-        get() = context.getString(R.string.compatibility_check_isdr_channel_desc)
-
-    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State {
-        val seService = connectSEService(context)
-        val readers = seService.readers.filter { it.isSIM }
-        if (readers.isEmpty()) {
-            failureDescription = context.getString(R.string.compatibility_check_isdr_channel_desc_unknown)
-            return State.FAILURE_UNKNOWN
-        }
-
-        val (validSlotIds, result) = readers.map {
-            try {
-                // Note: we ONLY check the default ISD-R AID, because this test is for the _device_,
-                // NOT the eUICC. We don't care what AID a potential eUICC might use, all we need to
-                // check is we can open _some_ AID.
-                it.openSession().openLogicalChannel(EUICC_DEFAULT_ISDR_AID.decodeHex())?.close()
-                Pair(it.slotIndex, State.SUCCESS)
-            } catch (_: SecurityException) {
-                // Ignore; this is expected when everything works
-                // ref: https://android.googlesource.com/platform/frameworks/base/+/4fe64fb4712a99d5da9c9a0eb8fd5169b252e1e1/omapi/java/android/se/omapi/Session.java#305
-                // SecurityException is only thrown when Channel is constructed, which means everything else needs to succeed
-                Pair(it.slotIndex, State.SUCCESS)
-            } catch (e: IOException) {
-                e.printStackTrace()
-                if (e.message?.contains("Secure Element is not present") == true) {
-                    failureDescription = context.getString(R.string.compatibility_check_isdr_channel_desc_unknown)
-                    Pair(it.slotIndex, State.FAILURE_UNKNOWN)
-                } else {
-                    Pair(it.slotIndex, State.FAILURE)
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                Pair(it.slotIndex, State.FAILURE)
-            }
-        }.fold(Pair(mutableListOf<Int>(), State.SUCCESS)) { (ids, result), (id, ok) ->
-            if (ok != State.SUCCESS) {
-                Pair(ids, ok)
-            } else {
-                Pair(ids.apply { add(id) }, result)
-            }
-        }
-
-        if (result != State.SUCCESS && validSlotIds.isNotEmpty()) {
-            if (!context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_EUICC)) {
-                failureDescription = context.getString(
-                    R.string.compatibility_check_isdr_channel_desc_partial_fail,
-                    validSlotIds.joinToString(", ")
-                )
-            } else {
-                // If the device has embedded eSIMs, we can likely ignore the failure here;
-                // the OMAPI failure likely resulted from trying to access internal eSIMs.
-                return State.SUCCESS
-            }
-        }
-
-        return result
-    }
-}
-
-internal class KnownBrokenCheck(private val context: Context): CompatibilityCheck(context) {
-    companion object {
-        val BROKEN_MANUFACTURERS = arrayOf("xiaomi", "huawei", "honor")
-    }
-
-    override val title: String
-        get() = context.getString(R.string.compatibility_check_known_broken)
-    override val defaultDescription: String
-        get() = context.getString(R.string.compatibility_check_known_broken_desc)
-
-    init {
-        failureDescription = context.getString(R.string.compatibility_check_known_broken_fail)
-    }
-
-    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State =
-        if (Build.MANUFACTURER.lowercase() in BROKEN_MANUFACTURERS) {
-            State.FAILURE
-        } else {
-            State.SUCCESS
-        }
-}
-
-internal class UsbCheck(private val context: Context) : CompatibilityCheck(context) {
-    override val title: String
-        get() = context.getString(R.string.compatibility_check_usb)
-    override val defaultDescription: String
-        get() = context.getString(R.string.compatibility_check_usb_desc)
-
-    init {
-        successDescription = context.getString(R.string.compatibility_check_usb_ok)
-        failureDescription = context.getString(R.string.compatibility_check_usb_fail)
-    }
-
-    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State =
-        if (context.packageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {
-            State.SUCCESS
-        } else {
-            State.FAILURE
-        }
-
-}
-
-internal class Verdict(private val context: Context) : CompatibilityCheck(context) {
-    override val title: String
-        get() = context.getString(R.string.compatibility_check_verdict)
-    override val defaultDescription: String
-        get() = context.getString(R.string.compatibility_check_verdict_desc)
-
-    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State {
-        if (allChecks.findCheck<KnownBrokenCheck>()?.state == State.FAILURE) {
-            failureDescription = context.getString(
-                R.string.compatibility_check_verdict_known_broken,
-                context.getString(R.string.compatibility_check_verdict_fail_shared)
-            )
-            return State.FAILURE
-        }
-
-        if (allChecks.findCheck<OmapiConnCheck>()?.state == State.SUCCESS &&
-            allChecks.findCheck<IsdrChannelAccessCheck>()?.state == State.SUCCESS
-        ) {
-            successDescription = context.getString(R.string.compatibility_check_verdict_ok)
-            return State.SUCCESS
-        }
-
-        if (allChecks.findCheck<OmapiConnCheck>()?.state == State.FAILURE_UNKNOWN ||
-            allChecks.findCheck<IsdrChannelAccessCheck>()?.state == State.FAILURE_UNKNOWN
-        ) {
-            // We are not sure because we can't fully check OMAPI
-            // however we can guess based on feature flags
-            // TODO: We probably need a "known-good" list for these devices as well?
-            failureDescription = context.getString(
-                if (allChecks.findCheck<HasSystemFeaturesCheck>()?.state == State.SUCCESS) {
-                    R.string.compatibility_check_verdict_unknown_likely_ok
-                } else {
-                    R.string.compatibility_check_verdict_unknown_likely_fail
-                },
-                context.getString(R.string.compatibility_check_verdict_fail_shared)
-            )
-            return State.FAILURE_UNKNOWN
-        }
-
-        failureDescription = context.getString(
-            R.string.compatibility_check_verdict_unknown,
-            context.getString(R.string.compatibility_check_verdict_fail_shared)
-        )
-        return State.FAILURE_UNKNOWN
-    }
-}
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/layout/activity_compatibility_check.xml b/app-unpriv/src/main/res/layout/activity_compatibility_check.xml
deleted file mode 100644
index 4d622e3..0000000
--- a/app-unpriv/src/main/res/layout/activity_compatibility_check.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/toolbar_activity" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/values-ja/strings.xml b/app-unpriv/src/main/res/values-ja/strings.xml
index 3a6851a..c9443dc 100644
--- a/app-unpriv/src/main/res/values-ja/strings.xml
+++ b/app-unpriv/src/main/res/values-ja/strings.xml
@@ -6,32 +6,4 @@
     <!-- Toast -->
     <string name="toast_ara_m_copied">ARA-M SHA-1 をクリップボードにコピーしました</string>
     <string name="toast_prompt_to_enable_sim_toolkit">「%s」アプリを有効化してください</string>
-    <!-- Compatibility Check Descriptions -->
-    <string name="compatibility_check_system_features">システムの機能</string>
-    <string name="compatibility_check_system_features_desc">デバイスにリムーバブル eUICC カードの管理に必要なすべての機能が備わっているかどうか。例えば基本的な電話機能や OMAPI のサポートなど。</string>
-    <string name="compatibility_check_system_features_no_telephony">使用しているデバイスには電話機能がありません。</string>
-    <string name="compatibility_check_system_features_no_omapi">使用しているデバイスまたはシステムには OMAPI のサポートを宣言していません。これは、ハードウェアからのサポートが不足していることが原因の可能性があります。または、フラグが不足していることが原因の可能性もあります。OMAPI が実際にサポートされているかどうかを判断するには次の 2 つのチェック項目を参照してください。</string>
-    <string name="compatibility_check_omapi_connectivity">OMAPI の接続</string>
-    <string name="compatibility_check_omapi_connectivity_desc">使用しているデバイスは、OMAPI 経由で SIM カード上のセキュアエレメントへのアクセスを許可しているか否や。</string>
-    <string name="compatibility_check_omapi_connectivity_fail">OMAPI 経由で SIM カードのセキュアエレメントリーダーを検出できません。このデバイスに SIM を挿入していない場合は、SIM を挿入後にこのチェックを再試行してください。</string>
-    <string name="compatibility_check_omapi_connectivity_partial_success_sim_number">セキュアエレメントのアクセスが正常に検出されましたが、次の SIM スロットでのみ有効です: &lt;b&gt;SIM%s&lt;/b&gt;</string>
-    <string name="compatibility_check_isdr_channel">ISD-R チャネルアクセス</string>
-    <string name="compatibility_check_isdr_channel_desc">使用しているデバイスは、OMAPI 経由で eSIM への ISD-R (管理) チャネルを開くことをサポートしているか否や。</string>
-    <string name="compatibility_check_isdr_channel_desc_unknown">OMAPI 経由での ISD-R アクセスがサポートされているかどうかを確認できません。まだ SIM カードが挿入されていない場合は、挿入した状態で再試行してください (どの SIM カードでも構いません)。</string>
-    <string name="compatibility_check_isdr_channel_desc_partial_fail">ISD-R への OMAPI アクセスは、次のスロットでのみ可能です: &lt;b&gt;SIM%s&lt;/b&gt;</string>
-    <string name="compatibility_check_known_broken">既知の破損リストの記載されていない</string>
-    <string name="compatibility_check_known_broken_desc">取り外し可能な eSIM に関連するバグがデバイスに存在しないかを確認します。</string>
-    <string name="compatibility_check_known_broken_fail">おっと...使用しているデバイスには、取り外し可能な eSIM へのアクセス時にバグが存在します。これは必ずしも全く機能しないことを意味するわけではありませんが、注意して進める必要があります。</string>
-    <string name="compatibility_check_usb">USB カードリーダーのサポート</string>
-    <string name="compatibility_check_usb_desc">使用しているデバイスは、USB カードリーダー経由の eSIM の管理をサポートしているか否や。</string>
-    <string name="compatibility_check_usb_ok">このデバイスの標準 USB CCID リーダーを介して eSIM を管理できます (ここで他のチェック項目に失敗した場合でも)。カードリーダーを挿入し、このアプリを開いてこの方法で eSIM を管理できます。</string>
-    <string name="compatibility_check_usb_fail">使用しているデバイスは USB ホストとしての機能をサポートしていません。</string>
-    <string name="compatibility_check_verdict">判定 (USB 以外)</string>
-    <string name="compatibility_check_verdict_desc">これまでのすべてのチェック項目に基づいて、デバイスに挿入された取り外し可能な eSIM の管理と互換性がある可能性はどの程度かについて</string>
-    <string name="compatibility_check_verdict_ok">このデバイスに挿入された取り外し可能な eSIM の使用および管理が使用できる可能性があります。</string>
-    <string name="compatibility_check_verdict_known_broken">挿入された取り外し可能な eSIM にアクセスするとデバイスにバグが発生することが知られています。\n%s</string>
-    <string name="compatibility_check_verdict_unknown_likely_ok">挿入された取り外し可能な eSIM が使用しているデバイスで管理できるかはわかりません。ただし、このデバイスは OMAPI のサポートを宣言しているため、動作する可能性はわずかに高くなります。\n%s</string>
-    <string name="compatibility_check_verdict_unknown_likely_fail">挿入された取り外し可能な eSIM がデバイス上で管理できるかどうかは判断できません。デバイスが OMAPI のサポートを宣言していないため、このデバイス上で取り外し可能な eSIM を管理することはサポートされていない可能性があります。\n%s</string>
-    <string name="compatibility_check_verdict_unknown">挿入された取り外し可能な eSIM がデバイス上で管理できるかどうかを確認できません。\n%s</string>
-    <string name="compatibility_check_verdict_fail_shared">ただし、eSIM プロファイルがすでに読み込まれている場合、有効化されたプロファイル自体は引き続き機能します。また、プロファイルが管理できない場合は、このデバイスで USB カードリーダーを介してプロファイルを管理できる可能性があります。</string>
 </resources>
diff --git a/app-unpriv/src/main/res/values-zh-rCN/strings.xml b/app-unpriv/src/main/res/values-zh-rCN/strings.xml
index 8d3060d..5666fbb 100644
--- a/app-unpriv/src/main/res/values-zh-rCN/strings.xml
+++ b/app-unpriv/src/main/res/values-zh-rCN/strings.xml
@@ -1,32 +1,5 @@
 <resources>
     <string name="compatibility_check">兼容性检查</string>
     <string name="open_sim_toolkit">打开 SIM 卡应用程序</string>
-    <string name="compatibility_check_system_features">系统功能</string>
-    <string name="compatibility_check_system_features_desc">您的设备是否具有管理可插拔 eUICC 卡所需的所有功能。例如，基本的电话功能和 OMAPI 支持。</string>
-    <string name="compatibility_check_system_features_no_telephony">您的设备没有电话功能。</string>
-    <string name="compatibility_check_system_features_no_omapi">您的设备/系统未声明支持 OMAPI。这可能是由于缺少硬件支持，或者可能仅仅是由于缺少标志。请参阅以下两项检查以确定 OMAPI 是否确实受支持。</string>
-    <string name="compatibility_check_omapi_connectivity">OMAPI 连接</string>
-    <string name="compatibility_check_omapi_connectivity_desc">您的设备是否允许通过 OMAPI 访问 SIM 卡上的安全元件？</string>
-    <string name="compatibility_check_omapi_connectivity_fail">无法通过 OMAPI 检测到 SIM 卡的 Secure Element。如果您尚未在此设备中插入 SIM 卡，请尝试插入一张 SIM 卡并重试此检查。</string>
-    <string name="compatibility_check_omapi_connectivity_partial_success_sim_number">已成功检测到可访问 Secure Element 的卡槽，但仅限于以下 SIM 卡槽：<b>SIM%s</b>。</string>
-    <string name="compatibility_check_isdr_channel">ISD-R 通道访问</string>
-    <string name="compatibility_check_isdr_channel_desc">您的设备是否支持通过 OMAPI 打开 eSIM 的 ISD-R (管理) 通道？</string>
-    <string name="compatibility_check_isdr_channel_desc_unknown">无法确定是否支持通过 OMAPI 进行 ISD-R 访问。如果尚未插入，您可能需要插入 SIM 卡 (任何 SIM 卡都可以) 重试。</string>
-    <string name="compatibility_check_isdr_channel_desc_partial_fail">OMAPI 只能在以下 SIM 插槽上访问 ISD-R：<b>SIM%s</b>。</string>
-    <string name="compatibility_check_known_broken">不在已知的 BUG 名单中</string>
-    <string name="compatibility_check_known_broken_desc">确保您的设备不存在与可插拔 eSIM 相关的错误。</string>
-    <string name="compatibility_check_known_broken_fail">糟糕，您的设备在访问可插拔 eSIM 时存在错误。这并不表示完全无法使用，但我们不保证该应用在您设备上的行为。</string>
-    <string name="compatibility_check_usb">USB 读卡器支持</string>
-    <string name="compatibility_check_usb_desc">您的设备是否支持通过 USB 读卡器管理 eSIM？</string>
-    <string name="compatibility_check_usb_ok">您可以通过此设备上的标准 USB CCID 读取器管理 eSIM (即使您在这里有任何其他检查项失败)。请插入读卡器，然后打开此应用程序以这种方式管理 eSIM。</string>
-    <string name="compatibility_check_usb_fail">您的设备不支持 USB 读卡器。</string>
-    <string name="compatibility_check_verdict">结论 (USB 读卡器以外)</string>
-    <string name="compatibility_check_verdict_desc">根据之前的所有检查，您的设备与可插拔 eSIM 卡兼容的可能性有多大？</string>
-    <string name="compatibility_check_verdict_ok">您可以使用和管理插入此设备的可插拔 eSIM 卡。</string>
-    <string name="compatibility_check_verdict_known_broken">已知您的设备在访问可插拔 eSIM 卡时存在问题。\n%s</string>
-    <string name="compatibility_check_verdict_unknown_likely_ok">我们无法确定是否可以在您的设备上管理可插拔 eSIM 卡。不过，您的设备确实声明支持 OMAPI，因此它工作的可能性略高。\n%s</string>
-    <string name="compatibility_check_verdict_unknown_likely_fail">我们无法确定是否可以在您的设备上管理可插拔 eSIM 卡。由于您的设备未声明支持OMAPI，因此更有可能不支持在此设备上管理可插拔 eSIM。\n%s</string>
-    <string name="compatibility_check_verdict_unknown">我们无法确定是否可以在您的设备上管理可插拔 eSIM 卡。\n%s</string>
-    <string name="compatibility_check_verdict_fail_shared">然而，已经加载了eSIM配置文件的可插拔 eSIM 卡仍然可以工作; 即使无法在装置上直接管理可插拔 eSIM 卡中的配置文件，您仍然可以使用 USB 卡读卡器来管理配置文件。</string>
     <string name="toast_ara_m_copied">ARA-M SHA-1 已拷贝到剪贴板</string>
 </resources>
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/values-zh-rTW/strings.xml b/app-unpriv/src/main/res/values-zh-rTW/strings.xml
index b8d0eb8..dcded79 100644
--- a/app-unpriv/src/main/res/values-zh-rTW/strings.xml
+++ b/app-unpriv/src/main/res/values-zh-rTW/strings.xml
@@ -1,32 +1,5 @@
 <resources>
     <string name="compatibility_check">相容性檢查</string>
     <string name="open_sim_toolkit">啟動 SIM 卡應用程式</string>
-    <string name="compatibility_check_system_features">系統功能</string>
-    <string name="compatibility_check_system_features_desc">您的裝置是否具有管理可插拔 eUICC 卡所需的所有功能。例如，基本的電話功能和 OMAPI 支援。</string>
-    <string name="compatibility_check_system_features_no_telephony">您的裝置沒有電話功能。</string>
-    <string name="compatibility_check_system_features_no_omapi">您的裝置/系統未宣告支援 OMAPI。這可能是由於缺少硬體支援，或者可能僅僅是由於缺少標誌。請參閱以下兩項檢查以確定 OMAPI 是否確實受支援。</string>
-    <string name="compatibility_check_omapi_connectivity">OMAPI 連線</string>
-    <string name="compatibility_check_omapi_connectivity_desc">您的裝置是否允許透過 OMAPI 存取 SIM 卡上的安全元件？</string>
-    <string name="compatibility_check_omapi_connectivity_fail">無法透過 OMAPI 偵測到 SIM 卡的 Secure Element。如果您尚未在此裝置中插入 SIM 卡，請嘗試插入一張 SIM 卡並重試此檢查。</string>
-    <string name="compatibility_check_omapi_connectivity_partial_success_sim_number">已成功檢測到可存取 Secure Element 的卡槽，但僅限於以下 SIM 卡槽：<b>SIM%s</b>。</string>
-    <string name="compatibility_check_isdr_channel">ISD-R 通道存取</string>
-    <string name="compatibility_check_isdr_channel_desc">您的裝置是否支援透過 OMAPI 開啟 eSIM 的 ISD-R (管理) 通道？</string>
-    <string name="compatibility_check_isdr_channel_desc_unknown">無法確定是否支援透過 OMAPI 進行 ISD-R 的存取。如果尚未插入，您可能需要插入 SIM 卡 (任何 SIM 卡都可以) 重試。</string>
-    <string name="compatibility_check_isdr_channel_desc_partial_fail">OMAPI 只能在以下 SIM 插槽上存取 ISD-R：<b>SIM%s</b>。</string>
-    <string name="compatibility_check_known_broken">不在已知錯誤清單中</string>
-    <string name="compatibility_check_known_broken_desc">確保您的裝置不存在與可插拔 eSIM 相關的錯誤。</string>
-    <string name="compatibility_check_known_broken_fail">很抱歉，您的裝置在存取可插拔 eSIM 時存在錯誤。這並不表示完全無法使用，但我們不保證該應用在您裝置上的行為。</string>
-    <string name="compatibility_check_usb">USB 晶片讀卡機支援</string>
-    <string name="compatibility_check_usb_desc">您的裝置是否支援透過 USB 晶片讀卡機管理 eSIM？</string>
-    <string name="compatibility_check_usb_ok">您可以透過此裝置上的標準 USB CCID 讀卡機管理 eSIM (即使您在這裡有任何其他檢查項失敗)。請插入讀卡機，然後開啟此應用程式以這種方式管理 eSIM。</string>
-    <string name="compatibility_check_usb_fail">您的裝置不支援 USB 晶片讀卡機。</string>
-    <string name="compatibility_check_verdict">結論 (USB 晶片讀卡機以外)</string>
-    <string name="compatibility_check_verdict_desc">根據之前的所有檢查，您的裝置與可插拔 eSIM 卡相容的可能性有多大？</string>
-    <string name="compatibility_check_verdict_ok">您可以使用和管理插入此裝置的可插拔 eSIM 卡。</string>
-    <string name="compatibility_check_verdict_known_broken">已知您的裝置在存取可插拔 eSIM 卡時存在問題。\n%s</string>
-    <string name="compatibility_check_verdict_unknown_likely_ok">我們無法確定是否可以在您的裝置上管理可插拔 eSIM 卡。不過，您的裝置確實宣告支援 OMAPI，因此它工作的可能性略高。\n%s</string>
-    <string name="compatibility_check_verdict_unknown_likely_fail">我們無法確定是否可以在您的裝置上管理可插拔 eSIM 卡。由於您的裝置未宣告支援OMAPI，因此更有可能不支援在此裝置上管理可插拔 eSIM。\n%s</string>
-    <string name="compatibility_check_verdict_unknown">我們無法確定是否可以在您的裝置上管理可插拔 eSIM 卡。\n%s</string>
-    <string name="compatibility_check_verdict_fail_shared">然而，已經載入了eSIM設定檔的可插拔 eSIM 卡仍然可以工作; 即使無法在裝置上直接管理可插拔 eSIM 卡中的設定檔，您仍然可以使用 USB 卡讀卡機來管理設定檔。</string>
     <string name="toast_ara_m_copied">ARA-M SHA-1 已複製到剪貼簿</string>
 </resources>
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/values/strings.xml b/app-unpriv/src/main/res/values/strings.xml
index 490b128..9ab4d3d 100644
--- a/app-unpriv/src/main/res/values/strings.xml
+++ b/app-unpriv/src/main/res/values/strings.xml
@@ -19,33 +19,4 @@
     <string name="quick_compatibility_result_slots">SIM card slots accessible: %s</string>
     <string name="quick_compatibility_result_notes">Note: these results are for reference only. Even if a SIM slot is not listed above, it <i>may</i> be compatible as well once a SIM card is inserted.</string>
     <string name="quick_compatibility_button_continue">Continue</string>
-
-    <!-- Compatibility Check Descriptions -->
-    <string name="compatibility_check_system_features">System Features</string>
-    <string name="compatibility_check_system_features_desc">Whether your device has all the required features for managing removable eUICC cards. For example, basic telephony and OMAPI support.</string>
-    <string name="compatibility_check_system_features_no_telephony">Your device has no telephony features.</string>
-    <string name="compatibility_check_system_features_no_omapi">Your device / system does not declare support for OMAPI. This could be due to missing support from hardware, or it could be simply due to a missing flag. See the following two checks to determine whether OMAPI is actually supported or not.</string>
-    <string name="compatibility_check_omapi_connectivity">OMAPI Connectivity</string>
-    <string name="compatibility_check_omapi_connectivity_desc">Does your device allow access to Secure Elements on SIM cards via OMAPI?</string>
-    <string name="compatibility_check_omapi_connectivity_fail">Unable to detect Secure Element readers for SIM cards via OMAPI. If you have not inserted a SIM in this device, try inserting one and retry this check.</string>
-    <string name="compatibility_check_omapi_connectivity_partial_success_sim_number">Successfully detected Secure Element access, but only for the following SIM slots: &lt;b&gt;SIM%s&lt;/b&gt;.</string>
-    <string name="compatibility_check_isdr_channel">ISD-R Channel Access</string>
-    <string name="compatibility_check_isdr_channel_desc">Does your device support opening an ISD-R (management) channel to eSIMs via OMAPI?</string>
-    <string name="compatibility_check_isdr_channel_desc_unknown">Cannot determine whether ISD-R access through OMAPI is supported. You might want to retry with SIM cards inserted (any SIM card will do) if not already.</string>
-    <string name="compatibility_check_isdr_channel_desc_partial_fail">OMAPI access to ISD-R is only possible on the following SIM slots: &lt;b&gt;SIM%s&lt;/b&gt;.</string>
-    <string name="compatibility_check_known_broken">Not on the Known Broken List</string>
-    <string name="compatibility_check_known_broken_desc">Making sure your device is not known to have bugs associated with removable eSIMs.</string>
-    <string name="compatibility_check_known_broken_fail">Oops, your device is known to have bugs when accessing removable eSIMs. This does not necessarily mean that it will not work at all, but you will have to proceed with caution.</string>
-    <string name="compatibility_check_usb">USB Card Reader Support</string>
-    <string name="compatibility_check_usb_desc">Does your device support managing eSIMs via USB card readers?</string>
-    <string name="compatibility_check_usb_ok">You can manage eSIMs through standard USB CCID readers on this device (even if you had any other check items fail here). Insert the card reader and then open this app to manage eSIMs in this way.</string>
-    <string name="compatibility_check_usb_fail">Your device does not support acting as a USB host.</string>
-    <string name="compatibility_check_verdict">Verdict (non-USB)</string>
-    <string name="compatibility_check_verdict_desc">Based on all previous checks, how likely is your device to be compatible with managing inserted removable eSIMs?</string>
-    <string name="compatibility_check_verdict_ok">You can likely use and manage removable eSIMs inserted into this device.</string>
-    <string name="compatibility_check_verdict_known_broken">Your device is known to be buggy when accessing inserted removable eSIMs.\n%s</string>
-    <string name="compatibility_check_verdict_unknown_likely_ok">We cannot determine whether inserted removable eSIMs can be managed on your device. Your device does declare support for OMAPI, though, so it is slightly more likely that it will work.\n%s</string>
-    <string name="compatibility_check_verdict_unknown_likely_fail">We cannot determine whether inserted removable eSIMs can be managed on your device. Since your device does not declare support for OMAPI, it is more likely that managing removable eSIMs on this device is unsupported.\n%s</string>
-    <string name="compatibility_check_verdict_unknown">We cannot determine whether inserted removable eSIMs can be managed on your device.\n%s</string>
-    <string name="compatibility_check_verdict_fail_shared">However, a removable eSIM that has already been loaded with an eSIM profile will still work; you can also most likely use a USB card reader plugged into this device to manage profiles, even if you cannot manage one inserted into your device.</string>
 </resources>
\ No newline at end of file

From 4991f2580ec9265e901019263beae37b0ae76322 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 10:43:21 -0400
Subject: [PATCH 05/19] Add a different note for the incompatible result

---
 .../ui/QuickCompatibilityFragment.kt          | 37 ++++++++++++-------
 app-unpriv/src/main/res/values/strings.xml    |  1 +
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
index 9b54640..943b72a 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
@@ -4,6 +4,7 @@ import android.content.pm.PackageManager
 import android.icu.text.ListFormatter
 import android.os.Build
 import android.os.Bundle
+import android.se.omapi.Reader
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,8 +18,6 @@ import im.angry.openeuicc.util.EUICC_DEFAULT_ISDR_AID
 import im.angry.openeuicc.util.UnprivilegedEuiccContextMarker
 import im.angry.openeuicc.util.connectSEService
 import im.angry.openeuicc.util.decodeHex
-import im.angry.openeuicc.util.isSIM
-import im.angry.openeuicc.util.slotIndex
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 
@@ -66,22 +65,26 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
     }
 
     private fun onContinueToApp() {
-        runBlocking {
-            preferenceRepository.skipQuickAvailabilityFlow
-                .updatePreference(true)
-        }
         requireActivity().finish()
     }
 
     private fun onCompatibilityUpdate(result: CompatibilityResult) {
         conclusion.text = formatConclusion(result)
-        if (result.compatibility != Compatibility.COMPATIBLE) return
-        resultSlots.isVisible = true
-        resultSlots.text = getString(
-            R.string.quick_compatibility_result_slots,
-            ListFormatter.getInstance().format(result.slots)
-        )
-        resultNotes.isVisible = true
+        if (result.compatibility == Compatibility.COMPATIBLE) {
+            runBlocking {
+                preferenceRepository.skipQuickAvailabilityFlow
+                    .updatePreference(true)
+            }
+            resultSlots.isVisible = true
+            resultSlots.text = getString(
+                R.string.quick_compatibility_result_slots,
+                ListFormatter.getInstance().format(result.slots)
+            )
+            resultNotes.isVisible = true
+        } else {
+            resultNotes.isVisible = true
+            resultNotes.text = getString(R.string.quick_compatibility_result_notes_incompatible)
+        }
     }
 
     private suspend fun getCompatibilityCheckResult(): CompatibilityResult {
@@ -132,4 +135,10 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         appendLine("VERSION.RELEASE: ${Build.VERSION.RELEASE}")
         appendLine("VERSION.SDK_INT: ${Build.VERSION.SDK_INT}")
     }
-}
\ No newline at end of file
+}
+
+val Reader.isSIM: Boolean
+    get() = name.startsWith("SIM")
+
+val Reader.slotIndex: Int
+    get() = (name.replace("SIM", "").toIntOrNull() ?: 1)
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/values/strings.xml b/app-unpriv/src/main/res/values/strings.xml
index 9ab4d3d..8671ae7 100644
--- a/app-unpriv/src/main/res/values/strings.xml
+++ b/app-unpriv/src/main/res/values/strings.xml
@@ -18,5 +18,6 @@
     <string name="quick_compatibility_not_compatible_but_usb">Your smartphone is not fully compatible with %s. However, you can still use a USB smart card reader for near-full functionality.</string>
     <string name="quick_compatibility_result_slots">SIM card slots accessible: %s</string>
     <string name="quick_compatibility_result_notes">Note: these results are for reference only. Even if a SIM slot is not listed above, it <i>may</i> be compatible as well once a SIM card is inserted.</string>
+    <string name="quick_compatibility_result_notes_incompatible">Note: if you currently do not have any SIM card inserted, try the compatibility check again after inserting one. Any SIM card will do.</string>
     <string name="quick_compatibility_button_continue">Continue</string>
 </resources>
\ No newline at end of file

From 4c221f74ff30414f347c97c64f95fe2f47f2ad99 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 10:43:49 -0400
Subject: [PATCH 06/19] Don't do compatibility check in the main thread

---
 .../im/angry/openeuicc/ui/QuickCompatibilityFragment.kt     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
index 943b72a..9f684d9 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
@@ -18,8 +18,10 @@ import im.angry.openeuicc.util.EUICC_DEFAULT_ISDR_AID
 import im.angry.openeuicc.util.UnprivilegedEuiccContextMarker
 import im.angry.openeuicc.util.connectSEService
 import im.angry.openeuicc.util.decodeHex
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 
 open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMarker {
     companion object {
@@ -60,7 +62,9 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
     override fun onStart() {
         super.onStart()
         lifecycleScope.launch {
-            onCompatibilityUpdate(getCompatibilityCheckResult())
+            onCompatibilityUpdate(withContext(Dispatchers.IO) {
+                getCompatibilityCheckResult()
+            })
         }
     }
 

From 52cf68d43d68dc3e564b6d5b296547a58f0249e5 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 10:51:06 -0400
Subject: [PATCH 07/19] Show a different note when incompatible

---
 .../openeuicc/ui/QuickCompatibilityFragment.kt   | 16 ++++++++++++++++
 .../res/layout/fragment_quick_compatibility.xml  |  7 +++++++
 app-unpriv/src/main/res/values/strings.xml       |  1 +
 3 files changed, 24 insertions(+)

diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
index 9f684d9..c480a78 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
@@ -9,6 +9,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import android.widget.CheckBox
 import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
@@ -48,6 +49,10 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         requireView().requireViewById(R.id.quick_availability_result_notes)
     }
 
+    private val skipCheckBox: CheckBox by lazy {
+        requireView().requireViewById(R.id.quick_availability_skip)
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -57,6 +62,15 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
             .text = formatDeviceInformation()
         requireViewById<Button>(R.id.quick_availability_button_continue)
             .setOnClickListener { onContinueToApp() }
+        // Can't use the lazy field yet
+        requireViewById<CheckBox>(R.id.quick_availability_skip).setOnCheckedChangeListener { compoundButton, b ->
+            if (compoundButton.isVisible) {
+                runBlocking {
+                    preferenceRepository.skipQuickAvailabilityFlow
+                        .updatePreference(b)
+                }
+            }
+        }
     }
 
     override fun onStart() {
@@ -75,6 +89,7 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
     private fun onCompatibilityUpdate(result: CompatibilityResult) {
         conclusion.text = formatConclusion(result)
         if (result.compatibility == Compatibility.COMPATIBLE) {
+            // Don't show the message again, ever, if the result is compatible
             runBlocking {
                 preferenceRepository.skipQuickAvailabilityFlow
                     .updatePreference(true)
@@ -88,6 +103,7 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         } else {
             resultNotes.isVisible = true
             resultNotes.text = getString(R.string.quick_compatibility_result_notes_incompatible)
+            skipCheckBox.isVisible = true
         }
     }
 
diff --git a/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
index c1b206a..729f837 100644
--- a/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
+++ b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
@@ -38,6 +38,13 @@
         android:text="@string/quick_compatibility_result_notes"
         android:visibility="gone" />
 
+    <CheckBox
+        android:id="@+id/quick_availability_skip"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/quick_compatibility_skip" />
+
     <Button
         android:id="@+id/quick_availability_button_continue"
         android:layout_width="match_parent"
diff --git a/app-unpriv/src/main/res/values/strings.xml b/app-unpriv/src/main/res/values/strings.xml
index 8671ae7..269e40b 100644
--- a/app-unpriv/src/main/res/values/strings.xml
+++ b/app-unpriv/src/main/res/values/strings.xml
@@ -20,4 +20,5 @@
     <string name="quick_compatibility_result_notes">Note: these results are for reference only. Even if a SIM slot is not listed above, it <i>may</i> be compatible as well once a SIM card is inserted.</string>
     <string name="quick_compatibility_result_notes_incompatible">Note: if you currently do not have any SIM card inserted, try the compatibility check again after inserting one. Any SIM card will do.</string>
     <string name="quick_compatibility_button_continue">Continue</string>
+    <string name="quick_compatibility_skip">Don\'t show this message again</string>
 </resources>
\ No newline at end of file

From 0b4d065d4b1fa4b5f836e5861e2c0514993a3cfc Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 10:54:09 -0400
Subject: [PATCH 08/19] Adjust layout margin

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

diff --git a/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
index 729f837..10c8bd8 100644
--- a/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
+++ b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
@@ -49,6 +49,7 @@
         android:id="@+id/quick_availability_button_continue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
         android:text="@string/quick_compatibility_button_continue" />
 
 </LinearLayout>
\ No newline at end of file

From 0506475a85f18be9bf6b33f7517273b55d6f154e Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 10:56:33 -0400
Subject: [PATCH 09/19] More quick availability -> quick compatibility

---
 .../openeuicc/ui/QuickCompatibilityFragment.kt | 18 +++++++++---------
 .../openeuicc/ui/UnprivilegedMainActivity.kt   |  2 +-
 .../util/UnprivilegedPreferenceRepository.kt   |  4 ++--
 .../layout/fragment_quick_compatibility.xml    | 12 ++++++------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
index c480a78..1e9e5ad 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
@@ -38,19 +38,19 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
     }
 
     private val conclusion: TextView by lazy {
-        requireView().requireViewById(R.id.quick_availability_conclusion)
+        requireView().requireViewById(R.id.quick_compatibility_conclusion)
     }
 
     private val resultSlots: TextView by lazy {
-        requireView().requireViewById(R.id.quick_availability_result_slots)
+        requireView().requireViewById(R.id.quick_compatibility_result_slots)
     }
 
     private val resultNotes: TextView by lazy {
-        requireView().requireViewById(R.id.quick_availability_result_notes)
+        requireView().requireViewById(R.id.quick_compatibility_result_notes)
     }
 
     private val skipCheckBox: CheckBox by lazy {
-        requireView().requireViewById(R.id.quick_availability_skip)
+        requireView().requireViewById(R.id.quick_compatibility_skip)
     }
 
     override fun onCreateView(
@@ -58,15 +58,15 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View = inflater.inflate(R.layout.fragment_quick_compatibility, container, false).apply {
-        requireViewById<TextView>(R.id.quick_availability_device_information)
+        requireViewById<TextView>(R.id.quick_compatibility_device_information)
             .text = formatDeviceInformation()
-        requireViewById<Button>(R.id.quick_availability_button_continue)
+        requireViewById<Button>(R.id.quick_compatibility_button_continue)
             .setOnClickListener { onContinueToApp() }
         // Can't use the lazy field yet
-        requireViewById<CheckBox>(R.id.quick_availability_skip).setOnCheckedChangeListener { compoundButton, b ->
+        requireViewById<CheckBox>(R.id.quick_compatibility_skip).setOnCheckedChangeListener { compoundButton, b ->
             if (compoundButton.isVisible) {
                 runBlocking {
-                    preferenceRepository.skipQuickAvailabilityFlow
+                    preferenceRepository.skipQuickCompatibilityFlow
                         .updatePreference(b)
                 }
             }
@@ -91,7 +91,7 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         if (result.compatibility == Compatibility.COMPATIBLE) {
             // Don't show the message again, ever, if the result is compatible
             runBlocking {
-                preferenceRepository.skipQuickAvailabilityFlow
+                preferenceRepository.skipQuickCompatibilityFlow
                     .updatePreference(true)
             }
             resultSlots.isVisible = true
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt
index da75d6f..47bc904 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt
@@ -12,7 +12,7 @@ import kotlinx.coroutines.runBlocking
 class UnprivilegedMainActivity : MainActivity(), UnprivilegedEuiccContextMarker {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (runBlocking { !preferenceRepository.skipQuickAvailabilityFlow.first() }) {
+        if (runBlocking { !preferenceRepository.skipQuickCompatibilityFlow.first() }) {
             startActivity(Intent(this, QuickCompatibilityActivity::class.java))
         }
     }
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedPreferenceRepository.kt b/app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedPreferenceRepository.kt
index 193a2fa..6066858 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedPreferenceRepository.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedPreferenceRepository.kt
@@ -5,10 +5,10 @@ import androidx.datastore.preferences.core.booleanPreferencesKey
 
 internal object UnprivilegedPreferenceKeys {
     // ---- Miscellaneous ----
-    val SKIP_QUICK_AVAILABILITY = booleanPreferencesKey("skip_quick_availability")
+    val SKIP_QUICK_COMPATIBILITY = booleanPreferencesKey("skip_quick_compatibility")
 }
 
 class UnprivilegedPreferenceRepository(context: Context) : PreferenceRepository(context) {
     // ---- Miscellaneous ----
-    val skipQuickAvailabilityFlow = bindFlow(UnprivilegedPreferenceKeys.SKIP_QUICK_AVAILABILITY, false)
+    val skipQuickCompatibilityFlow = bindFlow(UnprivilegedPreferenceKeys.SKIP_QUICK_COMPATIBILITY, false)
 }
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
index 10c8bd8..c248dad 100644
--- a/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
+++ b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
@@ -8,7 +8,7 @@
     android:textAlignment="center">
 
     <TextView
-        android:id="@+id/quick_availability_conclusion"
+        android:id="@+id/quick_compatibility_conclusion"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -17,7 +17,7 @@
         android:textStyle="bold" />
 
     <TextView
-        android:id="@+id/quick_availability_device_information"
+        android:id="@+id/quick_compatibility_device_information"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="monospace"
@@ -25,28 +25,28 @@
         android:textAlignment="center" />
 
     <TextView
-        android:id="@+id/quick_availability_result_slots"
+        android:id="@+id/quick_compatibility_result_slots"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:visibility="gone" />
 
     <TextView
-        android:id="@+id/quick_availability_result_notes"
+        android:id="@+id/quick_compatibility_result_notes"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/quick_compatibility_result_notes"
         android:visibility="gone" />
 
     <CheckBox
-        android:id="@+id/quick_availability_skip"
+        android:id="@+id/quick_compatibility_skip"
         android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/quick_compatibility_skip" />
 
     <Button
-        android:id="@+id/quick_availability_button_continue"
+        android:id="@+id/quick_compatibility_button_continue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"

From eb006b8f19d1eb9879431006a5c8511ab4c29a0e Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 11:13:26 -0400
Subject: [PATCH 10/19] i18n: Update translations

---
 app-unpriv/src/main/res/values-ja/strings.xml     |  9 +++++++++
 app-unpriv/src/main/res/values-zh-rCN/strings.xml | 10 ++++++++++
 app-unpriv/src/main/res/values-zh-rTW/strings.xml | 10 ++++++++++
 3 files changed, 29 insertions(+)

diff --git a/app-unpriv/src/main/res/values-ja/strings.xml b/app-unpriv/src/main/res/values-ja/strings.xml
index c9443dc..33db2ff 100644
--- a/app-unpriv/src/main/res/values-ja/strings.xml
+++ b/app-unpriv/src/main/res/values-ja/strings.xml
@@ -6,4 +6,13 @@
     <!-- Toast -->
     <string name="toast_ara_m_copied">ARA-M SHA-1 をクリップボードにコピーしました</string>
     <string name="toast_prompt_to_enable_sim_toolkit">「%s」アプリを有効化してください</string>
+    <string name="quick_compatibility">互換性のチェック</string>
+    <string name="quick_compatibility_compatible">お使いのスマートフォンは %s 対応 SIM カードを管理できます</string>
+    <string name="quick_compatibility_not_compatible">お使いのスマートフォンは %s と互換性がありません</string>
+    <string name="quick_compatibility_not_compatible_but_usb">お使いのスマートフォンは %s と完全な互換性がありません。ただし、USBスマートカードリーダーを使用する場合、ほぼすべての機能を利用できます。</string>
+    <string name="quick_compatibility_result_slots">アクセス可能な SIM カードスロット: %s</string>
+    <string name="quick_compatibility_result_notes">注: これらの結果は参考用です。以上に記載されていない SIM スロットでも、SIM カードを挿入すれば利用できる可能性があります。</string>
+    <string name="quick_compatibility_result_notes_incompatible">注：現在 SIM カードが挿入されていない場合は、SIM カードを挿入してから再度互換性チェックをお試しください。どの SIM カードでも構いません。</string>
+    <string name="quick_compatibility_button_continue">つづく</string>
+    <string name="quick_compatibility_skip">このメッセージを再度表示しない</string>
 </resources>
diff --git a/app-unpriv/src/main/res/values-zh-rCN/strings.xml b/app-unpriv/src/main/res/values-zh-rCN/strings.xml
index 5666fbb..16a4238 100644
--- a/app-unpriv/src/main/res/values-zh-rCN/strings.xml
+++ b/app-unpriv/src/main/res/values-zh-rCN/strings.xml
@@ -2,4 +2,14 @@
     <string name="compatibility_check">兼容性检查</string>
     <string name="open_sim_toolkit">打开 SIM 卡应用程序</string>
     <string name="toast_ara_m_copied">ARA-M SHA-1 已拷贝到剪贴板</string>
+    <string name="toast_prompt_to_enable_sim_toolkit">请启用您的“％s”应用程序</string>
+    <string name="quick_compatibility">简易兼容性检测</string>
+    <string name="quick_compatibility_compatible">您的手机可以管理兼容 %s 的卡片</string>
+    <string name="quick_compatibility_not_compatible">您的手机与 %s 不兼容</string>
+    <string name="quick_compatibility_not_compatible_but_usb">您的手机与 %s 不完全兼容，但可以使用 USB 读卡器获得几乎全部功能</string>
+    <string name="quick_compatibility_result_slots">可读取的 SIM 卡槽: %s</string>
+    <string name="quick_compatibility_result_notes">注意：以上结果仅供参考。即使某些卡槽没有被列举出来，插卡后也可能可用。</string>
+    <string name="quick_compatibility_result_notes_incompatible">注意：如果您目前没有插卡，请插任意 SIM 卡后重试兼容性检测。</string>
+    <string name="quick_compatibility_button_continue">继续</string>
+    <string name="quick_compatibility_skip">不再显示此消息</string>
 </resources>
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/values-zh-rTW/strings.xml b/app-unpriv/src/main/res/values-zh-rTW/strings.xml
index dcded79..ece29df 100644
--- a/app-unpriv/src/main/res/values-zh-rTW/strings.xml
+++ b/app-unpriv/src/main/res/values-zh-rTW/strings.xml
@@ -2,4 +2,14 @@
     <string name="compatibility_check">相容性檢查</string>
     <string name="open_sim_toolkit">啟動 SIM 卡應用程式</string>
     <string name="toast_ara_m_copied">ARA-M SHA-1 已複製到剪貼簿</string>
+    <string name="toast_prompt_to_enable_sim_toolkit">請啟用您的“％s”應用程式</string>
+    <string name="quick_compatibility">簡易相容性檢測</string>
+    <string name="quick_compatibility_compatible">您的手機可以管理相容 %s 的卡片</string>
+    <string name="quick_compatibility_not_compatible">您的手機與 %s 不相容</string>
+    <string name="quick_compatibility_not_compatible_but_usb">您的手機與 %s 不完全相容，但可以使用 USB 讀卡機獲得幾乎全部功能</string>
+    <string name="quick_compatibility_result_slots">可讀取的 SIM 卡槽: %s</string>
+    <string name="quick_compatibility_result_notes">注意：以上結果僅供參考。即使某些卡槽沒有被列舉出來，插卡後也可能可用。</string>
+    <string name="quick_compatibility_result_notes_incompatible">注意：如果您目前沒有插卡，請插任何 SIM 卡後重試相容性檢測。</string>
+    <string name="quick_compatibility_button_continue">繼續</string>
+    <string name="quick_compatibility_skip">不再顯示此訊息</string>
 </resources>
\ No newline at end of file

From 8c982ae8902c4c10932ad64d2e08eaeb84869a0c Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 11:14:46 -0400
Subject: [PATCH 11/19] More quick availability -> quick compatibility

---
 .../angry/openeuicc/di/UnprivilegedUiComponentFactory.kt   | 2 +-
 .../im/angry/openeuicc/ui/QuickCompatibilityActivity.kt    | 7 +++----
 .../src/main/res/layout/activity_quick_compatibility.xml   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt
index 73f33d1..3eb09c0 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt
@@ -17,6 +17,6 @@ open class UnprivilegedUiComponentFactory : DefaultUiComponentFactory() {
     override fun createSettingsFragment(): Fragment =
         UnprivilegedSettingsFragment()
 
-    open fun createQuickAvailabilityFragment(): Fragment =
+    open fun createQuickCompatibilityFragment(): Fragment =
         QuickCompatibilityFragment()
 }
\ No newline at end of file
diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt
index d83903b..d5e599f 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt
@@ -1,6 +1,5 @@
 package im.angry.openeuicc.ui
 
-import android.content.Intent
 import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
@@ -14,12 +13,12 @@ class QuickCompatibilityActivity : AppCompatActivity(), OpenEuiccContextMarker {
         enableEdgeToEdge()
         setContentView(R.layout.activity_quick_compatibility)
 
-        val quickAvailabilityFragment =
+        val quickCompatibilityFragment =
             (appContainer.uiComponentFactory as UnprivilegedUiComponentFactory)
-                .createQuickAvailabilityFragment()
+                .createQuickCompatibilityFragment()
 
         supportFragmentManager.beginTransaction()
-            .replace(R.id.quick_availability_container, quickAvailabilityFragment)
+            .replace(R.id.quick_compatibility_container, quickCompatibilityFragment)
             .commit()
     }
 }
diff --git a/app-unpriv/src/main/res/layout/activity_quick_compatibility.xml b/app-unpriv/src/main/res/layout/activity_quick_compatibility.xml
index 42f3896..ae691d5 100644
--- a/app-unpriv/src/main/res/layout/activity_quick_compatibility.xml
+++ b/app-unpriv/src/main/res/layout/activity_quick_compatibility.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent">
 
     <FrameLayout
-        android:id="@+id/quick_availability_container"
+        android:id="@+id/quick_compatibility_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"

From 29b2cba673f73e4a69d408b1ffb953cf3ce76f0d Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 13:47:39 -0400
Subject: [PATCH 12/19] Use OMAPI access instead of ISD-R access to determine
 compatibility

...but still show ISD-R check results
---
 .../ui/QuickCompatibilityFragment.kt          | 23 +++++++++++++++----
 .../layout/fragment_quick_compatibility.xml   |  7 ++++++
 app-unpriv/src/main/res/values/strings.xml    |  2 ++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
index 1e9e5ad..d30521a 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
@@ -33,7 +33,8 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
 
         data class CompatibilityResult(
             val compatibility: Compatibility,
-            val slots: List<String> = emptyList()
+            val slotsOmapi: List<String> = emptyList(),
+            val slotsIsdr: List<String> = emptyList()
         )
     }
 
@@ -45,6 +46,10 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         requireView().requireViewById(R.id.quick_compatibility_result_slots)
     }
 
+    private val resultSlotsIsdr: TextView by lazy {
+        requireView().requireViewById(R.id.quick_compatibility_result_slots_isdr)
+    }
+
     private val resultNotes: TextView by lazy {
         requireView().requireViewById(R.id.quick_compatibility_result_notes)
     }
@@ -97,8 +102,17 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
             resultSlots.isVisible = true
             resultSlots.text = getString(
                 R.string.quick_compatibility_result_slots,
-                ListFormatter.getInstance().format(result.slots)
+                ListFormatter.getInstance().format(result.slotsOmapi)
             )
+            resultSlotsIsdr.isVisible = true
+            resultSlotsIsdr.text = if (result.slotsIsdr.isEmpty()) {
+                getString(R.string.quick_compatibility_unknown)
+            } else {
+                getString(
+                    R.string.quick_compatibility_result_slots_isdr,
+                    ListFormatter.getInstance().format(result.slotsIsdr)
+                )
+            }
             resultNotes.isVisible = true
         } else {
             resultNotes.isVisible = true
@@ -112,6 +126,7 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         if (!service.isConnected) {
             return CompatibilityResult(Compatibility.NOT_COMPATIBLE)
         }
+        val omapiSlots = service.readers.filter { it.isSIM }.map { it.slotIndex }
         val slots = service.readers.filter { it.isSIM }.mapNotNull { reader ->
             try {
                 // Note: we ONLY check the default ISD-R AID, because this test is for the _device_,
@@ -128,10 +143,10 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
                 null
             }
         }
-        if (slots.isEmpty()) {
+        if (omapiSlots.isEmpty()) {
             return CompatibilityResult(Compatibility.NOT_COMPATIBLE)
         }
-        return CompatibilityResult(Compatibility.COMPATIBLE, slots = slots.map { "SIM$it" })
+        return CompatibilityResult(Compatibility.COMPATIBLE, slotsOmapi = omapiSlots.map { "SIM$it" }, slotsIsdr = slots.map { "SIM$it" })
     }
 
     open fun formatConclusion(result: CompatibilityResult): String {
diff --git a/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
index c248dad..a4203a3 100644
--- a/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
+++ b/app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml
@@ -31,6 +31,13 @@
         android:layout_marginBottom="16dp"
         android:visibility="gone" />
 
+    <TextView
+        android:id="@+id/quick_compatibility_result_slots_isdr"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:visibility="gone" />
+
     <TextView
         android:id="@+id/quick_compatibility_result_notes"
         android:layout_width="wrap_content"
diff --git a/app-unpriv/src/main/res/values/strings.xml b/app-unpriv/src/main/res/values/strings.xml
index 269e40b..25f765f 100644
--- a/app-unpriv/src/main/res/values/strings.xml
+++ b/app-unpriv/src/main/res/values/strings.xml
@@ -17,8 +17,10 @@
     <string name="quick_compatibility_not_compatible">Your smartphone is not compatible with %s</string>
     <string name="quick_compatibility_not_compatible_but_usb">Your smartphone is not fully compatible with %s. However, you can still use a USB smart card reader for near-full functionality.</string>
     <string name="quick_compatibility_result_slots">SIM card slots accessible: %s</string>
+    <string name="quick_compatibility_result_slots_isdr">ISD-R access: %s</string>
     <string name="quick_compatibility_result_notes">Note: these results are for reference only. Even if a SIM slot is not listed above, it <i>may</i> be compatible as well once a SIM card is inserted.</string>
     <string name="quick_compatibility_result_notes_incompatible">Note: if you currently do not have any SIM card inserted, try the compatibility check again after inserting one. Any SIM card will do.</string>
     <string name="quick_compatibility_button_continue">Continue</string>
     <string name="quick_compatibility_skip">Don\'t show this message again</string>
+    <string name="quick_compatibility_unknown">Unknown</string>
 </resources>
\ No newline at end of file

From 1fd13634fc87a047d46c33263db22884b9bc5f7e Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 20 Jul 2025 14:19:51 -0400
Subject: [PATCH 13/19] i18n: Update new strings

---
 app-unpriv/src/main/res/values-ja/strings.xml     | 4 +++-
 app-unpriv/src/main/res/values-zh-rCN/strings.xml | 4 +++-
 app-unpriv/src/main/res/values-zh-rTW/strings.xml | 4 +++-
 app-unpriv/src/main/res/values/strings.xml        | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-unpriv/src/main/res/values-ja/strings.xml b/app-unpriv/src/main/res/values-ja/strings.xml
index 33db2ff..f3ff41f 100644
--- a/app-unpriv/src/main/res/values-ja/strings.xml
+++ b/app-unpriv/src/main/res/values-ja/strings.xml
@@ -10,9 +10,11 @@
     <string name="quick_compatibility_compatible">お使いのスマートフォンは %s 対応 SIM カードを管理できます</string>
     <string name="quick_compatibility_not_compatible">お使いのスマートフォンは %s と互換性がありません</string>
     <string name="quick_compatibility_not_compatible_but_usb">お使いのスマートフォンは %s と完全な互換性がありません。ただし、USBスマートカードリーダーを使用する場合、ほぼすべての機能を利用できます。</string>
-    <string name="quick_compatibility_result_slots">アクセス可能な SIM カードスロット: %s</string>
+    <string name="quick_compatibility_result_slots">アクセス可能なスロット: %s</string>
+    <string name="quick_compatibility_result_slots_isdr">ISD-R アクセス: %s</string>
     <string name="quick_compatibility_result_notes">注: これらの結果は参考用です。以上に記載されていない SIM スロットでも、SIM カードを挿入すれば利用できる可能性があります。</string>
     <string name="quick_compatibility_result_notes_incompatible">注：現在 SIM カードが挿入されていない場合は、SIM カードを挿入してから再度互換性チェックをお試しください。どの SIM カードでも構いません。</string>
     <string name="quick_compatibility_button_continue">つづく</string>
     <string name="quick_compatibility_skip">このメッセージを再度表示しない</string>
+    <string name="quick_compatibility_unknown">不明</string>
 </resources>
diff --git a/app-unpriv/src/main/res/values-zh-rCN/strings.xml b/app-unpriv/src/main/res/values-zh-rCN/strings.xml
index 16a4238..c4cf781 100644
--- a/app-unpriv/src/main/res/values-zh-rCN/strings.xml
+++ b/app-unpriv/src/main/res/values-zh-rCN/strings.xml
@@ -7,9 +7,11 @@
     <string name="quick_compatibility_compatible">您的手机可以管理兼容 %s 的卡片</string>
     <string name="quick_compatibility_not_compatible">您的手机与 %s 不兼容</string>
     <string name="quick_compatibility_not_compatible_but_usb">您的手机与 %s 不完全兼容，但可以使用 USB 读卡器获得几乎全部功能</string>
-    <string name="quick_compatibility_result_slots">可读取的 SIM 卡槽: %s</string>
+    <string name="quick_compatibility_result_slots">可读取的卡槽: %s</string>
+    <string name="quick_compatibility_result_slots_isdr">ISD-R 访问: %s</string>
     <string name="quick_compatibility_result_notes">注意：以上结果仅供参考。即使某些卡槽没有被列举出来，插卡后也可能可用。</string>
     <string name="quick_compatibility_result_notes_incompatible">注意：如果您目前没有插卡，请插任意 SIM 卡后重试兼容性检测。</string>
     <string name="quick_compatibility_button_continue">继续</string>
     <string name="quick_compatibility_skip">不再显示此消息</string>
+    <string name="quick_compatibility_unknown">未知</string>
 </resources>
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/values-zh-rTW/strings.xml b/app-unpriv/src/main/res/values-zh-rTW/strings.xml
index ece29df..3270c93 100644
--- a/app-unpriv/src/main/res/values-zh-rTW/strings.xml
+++ b/app-unpriv/src/main/res/values-zh-rTW/strings.xml
@@ -7,9 +7,11 @@
     <string name="quick_compatibility_compatible">您的手機可以管理相容 %s 的卡片</string>
     <string name="quick_compatibility_not_compatible">您的手機與 %s 不相容</string>
     <string name="quick_compatibility_not_compatible_but_usb">您的手機與 %s 不完全相容，但可以使用 USB 讀卡機獲得幾乎全部功能</string>
-    <string name="quick_compatibility_result_slots">可讀取的 SIM 卡槽: %s</string>
+    <string name="quick_compatibility_result_slots">可讀取的卡槽: %s</string>
+    <string name="quick_compatibility_result_slots_isdr">ISD-R 訪問: %s</string>
     <string name="quick_compatibility_result_notes">注意：以上結果僅供參考。即使某些卡槽沒有被列舉出來，插卡後也可能可用。</string>
     <string name="quick_compatibility_result_notes_incompatible">注意：如果您目前沒有插卡，請插任何 SIM 卡後重試相容性檢測。</string>
     <string name="quick_compatibility_button_continue">繼續</string>
     <string name="quick_compatibility_skip">不再顯示此訊息</string>
+    <string name="quick_compatibility_unknown">未知</string>
 </resources>
\ No newline at end of file
diff --git a/app-unpriv/src/main/res/values/strings.xml b/app-unpriv/src/main/res/values/strings.xml
index 25f765f..76d1c76 100644
--- a/app-unpriv/src/main/res/values/strings.xml
+++ b/app-unpriv/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="quick_compatibility_compatible">Your smartphone can manage %s-compatible cards</string>
     <string name="quick_compatibility_not_compatible">Your smartphone is not compatible with %s</string>
     <string name="quick_compatibility_not_compatible_but_usb">Your smartphone is not fully compatible with %s. However, you can still use a USB smart card reader for near-full functionality.</string>
-    <string name="quick_compatibility_result_slots">SIM card slots accessible: %s</string>
+    <string name="quick_compatibility_result_slots">Accessible slots: %s</string>
     <string name="quick_compatibility_result_slots_isdr">ISD-R access: %s</string>
     <string name="quick_compatibility_result_notes">Note: these results are for reference only. Even if a SIM slot is not listed above, it <i>may</i> be compatible as well once a SIM card is inserted.</string>
     <string name="quick_compatibility_result_notes_incompatible">Note: if you currently do not have any SIM card inserted, try the compatibility check again after inserting one. Any SIM card will do.</string>

From dfdd8948c5d9bf33635d7a2a8e50d37a4c32a304 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Mon, 21 Jul 2025 07:36:25 -0400
Subject: [PATCH 14/19] i18n: Fix string formatting

---
 app-unpriv/src/main/res/values-zh-rCN/strings.xml | 2 +-
 app-unpriv/src/main/res/values-zh-rTW/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-unpriv/src/main/res/values-zh-rCN/strings.xml b/app-unpriv/src/main/res/values-zh-rCN/strings.xml
index c4cf781..cd66a43 100644
--- a/app-unpriv/src/main/res/values-zh-rCN/strings.xml
+++ b/app-unpriv/src/main/res/values-zh-rCN/strings.xml
@@ -2,7 +2,7 @@
     <string name="compatibility_check">兼容性检查</string>
     <string name="open_sim_toolkit">打开 SIM 卡应用程序</string>
     <string name="toast_ara_m_copied">ARA-M SHA-1 已拷贝到剪贴板</string>
-    <string name="toast_prompt_to_enable_sim_toolkit">请启用您的“％s”应用程序</string>
+    <string name="toast_prompt_to_enable_sim_toolkit">请启用您的“%s”应用程序</string>
     <string name="quick_compatibility">简易兼容性检测</string>
     <string name="quick_compatibility_compatible">您的手机可以管理兼容 %s 的卡片</string>
     <string name="quick_compatibility_not_compatible">您的手机与 %s 不兼容</string>
diff --git a/app-unpriv/src/main/res/values-zh-rTW/strings.xml b/app-unpriv/src/main/res/values-zh-rTW/strings.xml
index 3270c93..ab64d6b 100644
--- a/app-unpriv/src/main/res/values-zh-rTW/strings.xml
+++ b/app-unpriv/src/main/res/values-zh-rTW/strings.xml
@@ -2,7 +2,7 @@
     <string name="compatibility_check">相容性檢查</string>
     <string name="open_sim_toolkit">啟動 SIM 卡應用程式</string>
     <string name="toast_ara_m_copied">ARA-M SHA-1 已複製到剪貼簿</string>
-    <string name="toast_prompt_to_enable_sim_toolkit">請啟用您的“％s”應用程式</string>
+    <string name="toast_prompt_to_enable_sim_toolkit">請啟用您的“%s”應用程式</string>
     <string name="quick_compatibility">簡易相容性檢測</string>
     <string name="quick_compatibility_compatible">您的手機可以管理相容 %s 的卡片</string>
     <string name="quick_compatibility_not_compatible">您的手機與 %s 不相容</string>

From c0cd7a25cf036d349594fe670fba3be0afa9ded6 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Mon, 21 Jul 2025 07:37:45 -0400
Subject: [PATCH 15/19] Fix text for ISD-R compatibility check

---
 .../openeuicc/ui/QuickCompatibilityFragment.kt   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
index d30521a..f6af78d 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
@@ -105,14 +105,15 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
                 ListFormatter.getInstance().format(result.slotsOmapi)
             )
             resultSlotsIsdr.isVisible = true
-            resultSlotsIsdr.text = if (result.slotsIsdr.isEmpty()) {
-                getString(R.string.quick_compatibility_unknown)
-            } else {
+            resultSlotsIsdr.text =
                 getString(
                     R.string.quick_compatibility_result_slots_isdr,
-                    ListFormatter.getInstance().format(result.slotsIsdr)
+                    if (result.slotsIsdr.isEmpty()) {
+                        getString(R.string.quick_compatibility_unknown)
+                    } else {
+                        ListFormatter.getInstance().format(result.slotsIsdr)
+                    }
                 )
-            }
             resultNotes.isVisible = true
         } else {
             resultNotes.isVisible = true
@@ -146,7 +147,10 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         if (omapiSlots.isEmpty()) {
             return CompatibilityResult(Compatibility.NOT_COMPATIBLE)
         }
-        return CompatibilityResult(Compatibility.COMPATIBLE, slotsOmapi = omapiSlots.map { "SIM$it" }, slotsIsdr = slots.map { "SIM$it" })
+        return CompatibilityResult(
+            Compatibility.COMPATIBLE,
+            slotsOmapi = omapiSlots.map { "SIM$it" },
+            slotsIsdr = slots.map { "SIM$it" })
     }
 
     open fun formatConclusion(result: CompatibilityResult): String {

From 1be6c25cb6f05a75028abaad8e2731a944fcf85a Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Wed, 23 Jul 2025 13:33:05 +0200
Subject: [PATCH 16/19] fix: lpac submodule (#206)

```
Fetching submodule libs/lpac-jni/src/main/jni/lpac
remote: Repository not found.
fatal: repository 'https://github.com/estkme/lpac/' not found
Errors during submodule fetch:
	libs/lpac-jni/src/main/jni/lpac
```

Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/206
Co-authored-by: septs <github@septs.pw>
Co-committed-by: septs <github@septs.pw>
---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index f888959..863f185 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "libs/lpac-jni/src/main/jni/lpac"]
 	path = libs/lpac-jni/src/main/jni/lpac
-	url = https://github.com/estkme/lpac
+	url = https://github.com/estkme-group/lpac.git

From 797f3dc722d13d76ae94c0f910eed61ad92d738a Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Wed, 23 Jul 2025 13:33:36 +0200
Subject: [PATCH 17/19] chore: unified profile string ids style (#205)

Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/205
Co-authored-by: septs <github@septs.pw>
Co-committed-by: septs <github@septs.pw>
---
 .../di/DefaultCustomizableTextProvider.kt     |  2 +-
 .../openeuicc/ui/EuiccManagementFragment.kt   |  6 +++---
 .../openeuicc/ui/ProfileRenameFragment.kt     |  2 +-
 .../src/main/res/layout/euicc_profile.xml     |  4 ++--
 .../main/res/menu/fragment_profile_rename.xml |  2 +-
 .../src/main/res/menu/profile_options.xml     |  8 +++----
 app-common/src/main/res/values-ja/strings.xml | 18 ++++++++--------
 .../src/main/res/values-zh-rCN/strings.xml    | 18 ++++++++--------
 .../src/main/res/values-zh-rTW/strings.xml    | 18 ++++++++--------
 app-common/src/main/res/values/strings.xml    | 21 ++++++++++---------
 10 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/app-common/src/main/java/im/angry/openeuicc/di/DefaultCustomizableTextProvider.kt b/app-common/src/main/java/im/angry/openeuicc/di/DefaultCustomizableTextProvider.kt
index b493611..76227fd 100644
--- a/app-common/src/main/java/im/angry/openeuicc/di/DefaultCustomizableTextProvider.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/di/DefaultCustomizableTextProvider.kt
@@ -8,7 +8,7 @@ open class DefaultCustomizableTextProvider(private val context: Context) : Custo
         get() = context.getString(R.string.no_euicc)
 
     override val profileSwitchingTimeoutMessage: String
-        get() = context.getString(R.string.enable_disable_timeout)
+        get() = context.getString(R.string.profile_switch_timeout)
 
     override fun formatInternalChannelName(logicalSlotId: Int): String =
         context.getString(R.string.channel_name_format, logicalSlotId)
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
index 3c94c6c..016e96f 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
@@ -253,7 +253,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                     if (!isUsb) {
                         withContext(Dispatchers.Main) {
                             AlertDialog.Builder(requireContext()).apply {
-                                setMessage(R.string.switch_did_not_refresh)
+                                setMessage(R.string.profile_switch_did_not_refresh)
                                 setPositiveButton(android.R.string.ok) { dialog, _ ->
                                     dialog.dismiss()
                                     requireActivity().finish()
@@ -380,9 +380,9 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
 
             state.setText(
                 if (profile.isEnabled) {
-                    R.string.enabled
+                    R.string.profile_state_enabled
                 } else {
-                    R.string.disabled
+                    R.string.profile_state_disabled
                 }
             )
             provider.text = profile.providerName
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt
index c588254..281e625 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt
@@ -65,7 +65,7 @@ class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragment
         super.onViewCreated(view, savedInstanceState)
         profileRenameNewName.editText!!.setText(currentName)
         toolbar.apply {
-            setTitle(R.string.rename)
+            setTitle(R.string.profile_rename)
             setNavigationOnClickListener {
                 if (!renaming) dismiss()
             }
diff --git a/app-common/src/main/res/layout/euicc_profile.xml b/app-common/src/main/res/layout/euicc_profile.xml
index 74c1d7a..021c53b 100644
--- a/app-common/src/main/res/layout/euicc_profile.xml
+++ b/app-common/src/main/res/layout/euicc_profile.xml
@@ -54,7 +54,7 @@
 
             <TextView
                 android:id="@+id/provider_label"
-                android:text="@string/provider"
+                android:text="@string/profile_provider"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
@@ -106,7 +106,7 @@
 
             <TextView
                 android:id="@+id/iccid_label"
-                android:text="@string/iccid"
+                android:text="@string/profile_iccid"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
diff --git a/app-common/src/main/res/menu/fragment_profile_rename.xml b/app-common/src/main/res/menu/fragment_profile_rename.xml
index bde850f..f55c56c 100644
--- a/app-common/src/main/res/menu/fragment_profile_rename.xml
+++ b/app-common/src/main/res/menu/fragment_profile_rename.xml
@@ -4,6 +4,6 @@
     <item
         android:id="@+id/ok"
         android:icon="@drawable/ic_check_black"
-        android:title="@string/rename"
+        android:title="@string/profile_rename"
         app:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/app-common/src/main/res/menu/profile_options.xml b/app-common/src/main/res/menu/profile_options.xml
index 6add53d..60722d6 100644
--- a/app-common/src/main/res/menu/profile_options.xml
+++ b/app-common/src/main/res/menu/profile_options.xml
@@ -2,18 +2,18 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/enable"
-        android:title="@string/enable"/>
+        android:title="@string/profile_enable"/>
 
     <item
         android:id="@+id/disable"
         android:visible="false"
-        android:title="@string/disable"/>
+        android:title="@string/profile_disable"/>
 
     <item
         android:id="@+id/rename"
-        android:title="@string/rename"/>
+        android:title="@string/profile_rename"/>
 
     <item
         android:id="@+id/delete"
-        android:title="@string/delete"/>
+        android:title="@string/profile_delete"/>
 </menu>
\ No newline at end of file
diff --git a/app-common/src/main/res/values-ja/strings.xml b/app-common/src/main/res/values-ja/strings.xml
index d51e2c7..e631d52 100644
--- a/app-common/src/main/res/values-ja/strings.xml
+++ b/app-common/src/main/res/values-ja/strings.xml
@@ -7,19 +7,19 @@
     <string name="help">ヘルプ</string>
     <string name="reload">スロットを再読み込み</string>
     <string name="channel_name_format">論理スロット %d</string>
-    <string name="enabled">有効済み</string>
-    <string name="disabled">無効済み</string>
-    <string name="provider">プロバイダー:</string>
+    <string name="profile_state_enabled">有効済み</string>
+    <string name="profile_state_disabled">無効済み</string>
+    <string name="profile_provider">プロバイダー:</string>
     <string name="profile_class">クラス:</string>
     <string name="profile_class_testing">テスト中</string>
     <string name="profile_class_provisioning">プロビジョニング</string>
     <string name="profile_class_operational">稼働中</string>
-    <string name="enable">有効化</string>
-    <string name="disable">無効化</string>
-    <string name="delete">削除</string>
-    <string name="rename">名前を変更</string>
-    <string name="enable_disable_timeout">eSIM チップがプロファイルの切り替えの待機中にタイムアウトしました。これはデバイスのモデムファームウェアのバグの可能性があります。機内モードに切り替えるかアプリを再起動、デバイスを再起動してください。</string>
-    <string name="switch_did_not_refresh">操作は成功しましたが、デバイスのモデムが更新を拒否しました。新しいプロファイルを使用するには機内モードに切り替えるか、再起動する必要があります。</string>
+    <string name="profile_enable">有効化</string>
+    <string name="profile_disable">無効化</string>
+    <string name="profile_delete">削除</string>
+    <string name="profile_rename">名前を変更</string>
+    <string name="profile_switch_timeout">eSIM チップがプロファイルの切り替えの待機中にタイムアウトしました。これはデバイスのモデムファームウェアのバグの可能性があります。機内モードに切り替えるかアプリを再起動、デバイスを再起動してください。</string>
+    <string name="profile_switch_did_not_refresh">操作は成功しましたが、デバイスのモデムが更新を拒否しました。新しいプロファイルを使用するには機内モードに切り替えるか、再起動する必要があります。</string>
     <string name="toast_profile_enable_failed">新しい eSIM プロファイルに切り替えることができません。</string>
     <string name="toast_profile_delete_confirm_text_mismatched">確認文字列が一致しません</string>
     <string name="toast_iccid_copied">ICCID をクリップボードにコピーしました</string>
diff --git a/app-common/src/main/res/values-zh-rCN/strings.xml b/app-common/src/main/res/values-zh-rCN/strings.xml
index 32ced90..b0938d3 100644
--- a/app-common/src/main/res/values-zh-rCN/strings.xml
+++ b/app-common/src/main/res/values-zh-rCN/strings.xml
@@ -6,16 +6,16 @@
     <string name="help">帮助</string>
     <string name="reload">重新加载卡槽</string>
     <string name="channel_name_format">逻辑卡槽 %d</string>
-    <string name="enabled">已启用</string>
-    <string name="disabled">已禁用</string>
-    <string name="provider">提供商:</string>
+    <string name="profile_state_enabled">已启用</string>
+    <string name="profile_state_disabled">已禁用</string>
+    <string name="profile_provider">提供商:</string>
     <string name="profile_class">类型:</string>
-    <string name="enable">启用</string>
-    <string name="disable">禁用</string>
-    <string name="delete">删除</string>
-    <string name="rename">重命名</string>
-    <string name="enable_disable_timeout">等待 eSIM 芯片切换配置文件时超时。这可能是您手机基带固件中的一个错误。请尝试切换飞行模式、重新启动应用程序或重新启动手机</string>
-    <string name="switch_did_not_refresh">操作成功, 但是您手机的基带拒绝刷新。您可能需要切换飞行模式或重新启动，以便使用新的配置文件。</string>
+    <string name="profile_enable">启用</string>
+    <string name="profile_disable">禁用</string>
+    <string name="profile_delete">删除</string>
+    <string name="profile_rename">重命名</string>
+    <string name="profile_switch_timeout">等待 eSIM 芯片切换配置文件时超时。这可能是您手机基带固件中的一个错误。请尝试切换飞行模式、重新启动应用程序或重新启动手机</string>
+    <string name="profile_switch_did_not_refresh">操作成功, 但是您手机的基带拒绝刷新。您可能需要切换飞行模式或重新启动，以便使用新的配置文件。</string>
     <string name="toast_profile_enable_failed">无法切换到新的 eSIM 配置文件。</string>
     <string name="toast_profile_delete_confirm_text_mismatched">输入的确认文本不匹配</string>
     <string name="toast_iccid_copied">已复制 ICCID 到剪贴板</string>
diff --git a/app-common/src/main/res/values-zh-rTW/strings.xml b/app-common/src/main/res/values-zh-rTW/strings.xml
index 5136bf7..e0334c6 100644
--- a/app-common/src/main/res/values-zh-rTW/strings.xml
+++ b/app-common/src/main/res/values-zh-rTW/strings.xml
@@ -6,16 +6,16 @@
     <string name="help">幫助</string>
     <string name="reload">重新載入卡槽</string>
     <string name="channel_name_format">虛擬卡槽 %d</string>
-    <string name="enabled">已啟用</string>
-    <string name="disabled">已停用</string>
-    <string name="provider">電信業者:</string>
+    <string name="profile_state_enabled">已啟用</string>
+    <string name="profile_state_disabled">已停用</string>
+    <string name="profile_provider">電信業者:</string>
     <string name="profile_class">類型:</string>
-    <string name="enable">啟用</string>
-    <string name="disable">停用</string>
-    <string name="delete">刪除</string>
-    <string name="rename">重新命名</string>
-    <string name="enable_disable_timeout">等待 eSIM 切換設定檔時逾時。這可能是您手機基頻處理器韌體中的一個錯誤。請嘗試切換飛航模式、重新啟動應用程式或重新啟動手機</string>
-    <string name="switch_did_not_refresh">操作成功, 但是您手機的基頻處理器沒有重新整理。您可能需要切換飛航模式或重新啟動，以便使用新的設定檔。</string>
+    <string name="profile_enable">啟用</string>
+    <string name="profile_disable">停用</string>
+    <string name="profile_delete">刪除</string>
+    <string name="profile_rename">重新命名</string>
+    <string name="profile_switch_timeout">等待 eSIM 切換設定檔時逾時。這可能是您手機基頻處理器韌體中的一個錯誤。請嘗試切換飛航模式、重新啟動應用程式或重新啟動手機</string>
+    <string name="profile_switch_did_not_refresh">操作成功, 但是您手機的基頻處理器沒有重新整理。您可能需要切換飛航模式或重新啟動，以便使用新的設定檔。</string>
     <string name="toast_profile_enable_failed">無法切換到新的 eSIM 設定檔。</string>
     <string name="toast_profile_delete_confirm_text_mismatched">輸入的確認文字不匹配</string>
     <string name="toast_iccid_copied">已複製 ICCID 到剪貼簿</string>
diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml
index 38bb976..d526238 100644
--- a/app-common/src/main/res/values/strings.xml
+++ b/app-common/src/main/res/values/strings.xml
@@ -11,23 +11,24 @@
     <string name="usb" translatable="false">USB</string>
     <string name="omapi" translatable="false">OpenMobile API (OMAPI)</string>
 
-    <string name="enabled">Enabled</string>
-    <string name="disabled">Disabled</string>
-    <string name="provider">Provider:</string>
+    <!-- Profile -->
+    <string name="profile_state_enabled">Enabled</string>
+    <string name="profile_state_disabled">Disabled</string>
+    <string name="profile_provider">Provider:</string>
     <string name="profile_class">Class:</string>
     <string name="profile_class_testing">Testing</string>
     <string name="profile_class_provisioning">Provisioning</string>
     <string name="profile_class_operational">Operational</string>
-    <string name="iccid" translatable="false">ICCID:</string>
+    <string name="profile_iccid" translatable="false">ICCID:</string>
     <string name="profile_sequence_number_format" translatable="false">#%d</string>
 
-    <string name="enable">Enable</string>
-    <string name="disable">Disable</string>
-    <string name="delete">Delete</string>
-    <string name="rename">Rename</string>
+    <string name="profile_enable">Enable</string>
+    <string name="profile_disable">Disable</string>
+    <string name="profile_delete">Delete</string>
+    <string name="profile_rename">Rename</string>
 
-    <string name="enable_disable_timeout">Timed out waiting for the eSIM chip to switch profiles. This may be a bug in your phone\'s modem firmware. Try toggling airplane mode, restarting the application, or rebooting the phone.</string>
-    <string name="switch_did_not_refresh">The operation was successful, but your phone\'s modem refused to refresh. You might need to toggle airplane mode or reboot in order to use the new profile.</string>
+    <string name="profile_switch_timeout">Timed out waiting for the eSIM chip to switch profiles. This may be a bug in your phone\'s modem firmware. Try toggling airplane mode, restarting the application, or rebooting the phone.</string>
+    <string name="profile_switch_did_not_refresh">The operation was successful, but your phone\'s modem refused to refresh. You might need to toggle airplane mode or reboot in order to use the new profile.</string>
 
     <string name="toast_profile_enable_failed">Cannot switch to new eSIM profile.</string>
     <string name="toast_profile_delete_confirm_text_mismatched">Confirmation string mismatch</string>

From e604f39e0d194c7b3f2c86e950eb6c46281bd1c0 Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Wed, 23 Jul 2025 13:34:04 +0200
Subject: [PATCH 18/19] fix: use customizableTextProvider in
 getCompatibilityCheckResult (#203)

Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/203
Co-authored-by: septs <github@septs.pw>
Co-committed-by: septs <github@septs.pw>
---
 .../openeuicc/ui/QuickCompatibilityFragment.kt  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
index f6af78d..9b41730 100644
--- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
+++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
@@ -127,8 +127,9 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         if (!service.isConnected) {
             return CompatibilityResult(Compatibility.NOT_COMPATIBLE)
         }
-        val omapiSlots = service.readers.filter { it.isSIM }.map { it.slotIndex }
-        val slots = service.readers.filter { it.isSIM }.mapNotNull { reader ->
+        val readers = service.readers.filter(Reader::isSIM)
+        val omapiSlots = readers.mapNotNull(Reader::slotIndex)
+        val slots = readers.mapNotNull { reader ->
             try {
                 // Note: we ONLY check the default ISD-R AID, because this test is for the _device_,
                 // NOT the eUICC. We don't care what AID a potential eUICC might use, all we need to
@@ -147,10 +148,12 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         if (omapiSlots.isEmpty()) {
             return CompatibilityResult(Compatibility.NOT_COMPATIBLE)
         }
+        val formatChannelName = appContainer.customizableTextProvider::formatInternalChannelName
         return CompatibilityResult(
             Compatibility.COMPATIBLE,
-            slotsOmapi = omapiSlots.map { "SIM$it" },
-            slotsIsdr = slots.map { "SIM$it" })
+            slotsOmapi = omapiSlots.map(formatChannelName),
+            slotsIsdr = slots.map(formatChannelName),
+        )
     }
 
     open fun formatConclusion(result: CompatibilityResult): String {
@@ -176,8 +179,8 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
     }
 }
 
-val Reader.isSIM: Boolean
+private inline val Reader.isSIM: Boolean
     get() = name.startsWith("SIM")
 
-val Reader.slotIndex: Int
-    get() = (name.replace("SIM", "").toIntOrNull() ?: 1)
\ No newline at end of file
+private inline val Reader.slotIndex: Int
+    get() = (name.replace("SIM", "").toIntOrNull() ?: 1) - 1 // 0-based index
\ No newline at end of file

From 813eedc5644f29dab0208a650a2a359d34288f3e Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Wed, 16 Jul 2025 01:31:06 +0800
Subject: [PATCH 19/19] feat: simplified error handling

---
 .../ui/wizard/SimplifiedErrorHandling.kt      | 145 ++++++++++++++++++
 app-common/src/main/res/values/strings.xml    |  20 +++
 2 files changed, 165 insertions(+)
 create mode 100644 app-common/src/main/java/im/angry/openeuicc/ui/wizard/SimplifiedErrorHandling.kt

diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/SimplifiedErrorHandling.kt b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/SimplifiedErrorHandling.kt
new file mode 100644
index 0000000..14a4f57
--- /dev/null
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/SimplifiedErrorHandling.kt
@@ -0,0 +1,145 @@
+package im.angry.openeuicc.ui.wizard
+
+import androidx.annotation.StringRes
+import im.angry.openeuicc.common.R
+import net.typeblog.lpac_jni.LocalProfileAssistant
+import org.json.JSONObject
+import java.net.NoRouteToHostException
+import java.net.PortUnreachableException
+import java.net.SocketException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import javax.net.ssl.SSLException
+
+object SimplifiedErrorHandling {
+    enum class ErrorCode(@StringRes val titleResId: Int, @StringRes val suggestResId: Int?) {
+        ICCIDAlready(
+            R.string.download_wizard_error_iccid_already,
+            R.string.download_wizard_error_suggest_profile_installed
+        ),
+        InsufficientMemory(
+            R.string.download_wizard_error_insufficient_memory,
+            R.string.download_wizard_error_suggest_insufficient_memory
+        ),
+        UnsupportedProfile(
+            R.string.download_wizard_error_unsupported_profile,
+            null
+        ),
+        CardInternalError(
+            R.string.download_wizard_error_card_internal_error,
+            null
+        ),
+        EIDMismatch(
+            R.string.download_wizard_error_eid_mismatch,
+            R.string.download_wizard_error_suggest_contact_reissue
+        ),
+        UnreleasedProfile(
+            R.string.download_wizard_error_profile_unreleased,
+            R.string.download_wizard_error_suggest_contact_reissue
+        ),
+        MatchingIDRefused(
+            R.string.download_wizard_error_matching_id_refused,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        ProfileRetriesExceeded(
+            R.string.download_wizard_error_profile_retries_exceeded,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        ConfirmationCodeMissing(
+            R.string.download_wizard_error_confirmation_code_missing,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        ConfirmationCodeRefused(
+            R.string.download_wizard_error_confirmation_code_refused,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        ConfirmationCodeRetriesExceeded(
+            R.string.download_wizard_error_confirmation_code_retries_exceeded,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        ProfileExpired(
+            R.string.download_wizard_error_profile_expired,
+            R.string.download_wizard_error_suggest_contact_carrier
+        ),
+        UnknownHost(
+            R.string.download_wizard_error_unknown_hostname,
+            null
+        ),
+        NetworkUnreachable(
+            R.string.download_wizard_error_network_unreachable,
+            R.string.download_wizard_error_suggest_network_unreachable
+        ),
+        TLSError(
+            R.string.download_wizard_error_tls_certificate,
+            null
+        )
+    }
+
+    private val httpErrors = buildMap {
+        // Stage: AuthenticateClient
+        put("8.1" to "4.8", ErrorCode.InsufficientMemory)
+        put("8.1.1" to "3.8", ErrorCode.EIDMismatch)
+        put("8.2" to "1.2", ErrorCode.UnreleasedProfile)
+        put("8.2.6" to "3.8", ErrorCode.MatchingIDRefused)
+        put("8.8.5" to "6.4", ErrorCode.ProfileRetriesExceeded)
+
+        // Stage: GetBoundProfilePackage
+        put("8.2.7" to "2.2", ErrorCode.ConfirmationCodeMissing)
+        put("8.2.7" to "3.8", ErrorCode.ConfirmationCodeRefused)
+        put("8.2.7" to "6.4", ErrorCode.ConfirmationCodeRetriesExceeded)
+
+        // Stage: AuthenticateClient, GetBoundProfilePackage
+        put("8.8.5" to "4.10", ErrorCode.ProfileExpired)
+    }
+
+    fun toSimplifiedDownloadError(exc: LocalProfileAssistant.ProfileDownloadException) = when {
+        exc.lpaErrorReason != "ES10B_ERROR_REASON_UNDEFINED" -> toSimplifiedLPAErrorReason(exc.lpaErrorReason)
+        exc.lastHttpResponse?.rcode == 200 -> toSimplifiedHTTPResponse(exc.lastHttpResponse!!)
+        exc.lastHttpException != null -> toSimplifiedHTTPException(exc.lastHttpException!!)
+        exc.lastApduResponse != null -> toSimplifiedAPDUResponse(exc.lastApduResponse!!)
+        else -> null
+    }
+
+    private fun toSimplifiedLPAErrorReason(reason: String) = when (reason) {
+        "ES10B_ERROR_REASON_UNSUPPORTED_CRT_VALUES" -> ErrorCode.UnsupportedProfile
+        "ES10B_ERROR_REASON_UNSUPPORTED_REMOTE_OPERATION_TYPE" -> ErrorCode.UnsupportedProfile
+        "ES10B_ERROR_REASON_UNSUPPORTED_PROFILE_CLASS" -> ErrorCode.UnsupportedProfile
+        "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_ICCID_ALREADY_EXISTS_ON_EUICC" -> ErrorCode.ICCIDAlready
+        "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_INSUFFICIENT_MEMORY_FOR_PROFILE" -> ErrorCode.InsufficientMemory
+        "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_INTERRUPTION" -> ErrorCode.CardInternalError
+        "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_PE_PROCESSING_ERROR" -> ErrorCode.CardInternalError
+        else -> null
+    }
+
+    private fun toSimplifiedHTTPResponse(response: net.typeblog.lpac_jni.HttpInterface.HttpResponse): ErrorCode? {
+        if (response.data.first().toInt() != '{'.code) return null
+        val response = JSONObject(response.data.decodeToString())
+        val statusCodeData = response.optJSONObject("header")
+            ?.optJSONObject("functionExecutionStatus")
+            ?.optJSONObject("statusCodeData")
+            ?: return null
+        val subjectCode = statusCodeData.optString("subjectCode")
+        val reasonCode = statusCodeData.optString("reasonCode")
+        return httpErrors[subjectCode to reasonCode]
+    }
+
+    private fun toSimplifiedHTTPException(exc: Exception) = when (exc) {
+        is SSLException -> ErrorCode.TLSError
+        is UnknownHostException -> ErrorCode.UnknownHost
+        is NoRouteToHostException -> ErrorCode.NetworkUnreachable
+        is PortUnreachableException -> ErrorCode.NetworkUnreachable
+        is SocketTimeoutException -> ErrorCode.NetworkUnreachable
+        is SocketException -> exc.message
+            ?.contains("Connection reset", ignoreCase = true)
+            ?.let { if (it) ErrorCode.NetworkUnreachable else null }
+        else -> null
+    }
+
+    private fun toSimplifiedAPDUResponse(resp: ByteArray): ErrorCode? {
+        val isSuccess = resp.size >= 2 &&
+                resp[resp.size - 2] == 0x90.toByte() &&
+                resp[resp.size - 1] == 0x00.toByte()
+        if (isSuccess) return null
+        return ErrorCode.CardInternalError
+    }
+}
diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml
index d526238..f28318f 100644
--- a/app-common/src/main/res/values/strings.xml
+++ b/app-common/src/main/res/values/strings.xml
@@ -103,6 +103,26 @@
     <string name="download_wizard_diagnostics_last_apdu_exception">Last APDU exception:</string>
     <string name="download_wizard_diagnostics_save">Save</string>
     <string name="download_wizard_diagnostics_file_template">Diagnostics at %s</string>
+    <string name="download_wizard_error_iccid_already">This eSIM profile is installed, Cannot be reinstalled.</string>
+    <string name="download_wizard_error_insufficient_memory">Sorry, The remaining capacity of this eSIM chip cannot be used to install this eSIM profile.</string>
+    <string name="download_wizard_error_unsupported_profile">Sorry, This eSIM profile is unsupported.</string>
+    <string name="download_wizard_error_card_internal_error">An error occurred inside the card.</string>
+    <string name="download_wizard_error_eid_mismatch">This eSIM profile has been installed on another device.</string>
+    <string name="download_wizard_error_profile_unreleased">This eSIM profile has been unreleased.</string>
+    <string name="download_wizard_error_matching_id_refused">This eSIM activation code is invalid.</string>
+    <string name="download_wizard_error_profile_retries_exceeded">The maximum number of retries for the eSIM profile has been exceeded.</string>
+    <string name="download_wizard_error_confirmation_code_missing">Please enter the confirmation code to continue.</string>
+    <string name="download_wizard_error_confirmation_code_refused">The confirmation code you entered is invalid.</string>
+    <string name="download_wizard_error_profile_expired">This eSIM profile has been expired.</string>
+    <string name="download_wizard_error_confirmation_code_retries_exceeded">The maximum number of retries for the Confirmation Code has been exceeded.</string>
+    <string name="download_wizard_error_unknown_hostname">Unknown SM-DP+ address</string>
+    <string name="download_wizard_error_network_unreachable">The current network is unreachable</string>
+    <string name="download_wizard_error_tls_certificate">TLS certificate error, this eSIM profile is not supported</string>
+    <string name="download_wizard_error_suggest_profile_installed">You are trying to reinstall an already installed eSIM profile</string>
+    <string name="download_wizard_error_suggest_insufficient_memory">Please delete an eSIM profile and try again</string>
+    <string name="download_wizard_error_suggest_contact_carrier">Please contact your carrier for assistance.</string>
+    <string name="download_wizard_error_suggest_contact_reissue">Please contact your carrier to reissue this eSIM profile.</string>
+    <string name="download_wizard_error_suggest_network_unreachable">The current network is unavailable. Please try again after changing the network.</string>
 
     <string name="logs_saved_message">Logs have been saved to the selected path. Would you like to share the log through another app?</string>