Update README.md

Reviewed-on: #226
Co-authored-by: septs <github@septs.pw>
Co-committed-by: septs <github@septs.pw>

.idea/.gitignore

@@ -1,14 +1,7 @@
-/shelf
+*
-/caches
+!/codeStyles/Project.xml
-/libraries
+!/codeStyles/codeStyleConfig.xml
-/assetWizardSettings.xml
+!/vcs.xml
-/deploymentTarget*.xml
+!/kotlinc.xml
-/gradle.xml
+!/compiler.xml
-/misc.xml
+!/migrations.xml
-/modules.xml
-/navEditor.xml
-/runConfigurations.xml
-/workspace.xml
-/AndroidProjectSystem.xml
-
-**/*.iml

README.md

@@ -16,7 +16,7 @@ There are two variants of this project, OpenEUICC and EasyEUICC:
 Some side notes:
 1. When privileged, OpenEUICC supports any eUICC chip that implements the SGP.22 standard, internal or external. However, there is __no guarantee__ that external (removable) eSIMs actually follow the standard. Please __DO NOT__ submit bug reports for non-functioning removable eSIMs. They are __NOT__ officially supported unless they also support / are supported by EasyEUICC, the unprivileged variant.
 2. Both variants support accessing eUICC chips through USB CCID readers, regardless of whether the chip contains the correct ARA-M hash to allow for unprivileged access. However, only `T=0` readers that use the standard [USB CCID protocol](https://en.wikipedia.org/wiki/CCID_(protocol)) are supported.
-3. Prebuilt release-mode EasyEUICC apks can be downloaded [here](https://gitea.angry.im/PeterCxy/OpenEUICC/releases). For OpenEUICC, no official release is currently provided and only debug mode APKs can be found in the CI page.
+3. Prebuilt release-mode EasyEUICC apks can be downloaded [here](https://gitea.angry.im/PeterCxy/OpenEUICC/releases). For OpenEUICC, no official release is currently provided and only debug mode APKs and Magisk modules can be found in the [CI page](https://gitea.angry.im/PeterCxy/OpenEUICC/actions).
 4. For removable eSIM chip vendors: to have your chip supported by official builds of EasyEUICC when inserted, include the ARA-M hash `2A2FA878BC7C3354C2CF82935A5945A3EDAE4AFA`.
 
 __This project is Free Software licensed under GNU GPL v3, WITHOUT the "or later" clause.__ Any modification and derivative work __MUST__ be released under the SAME license, which means, at the very least, that the source code __MUST__ be available upon request.
@@ -74,10 +74,7 @@ FAQs
 ===
 
 - Q: Do you provide prebuilt binaries for OpenEUICC?
-- A: Debug-mode APKs are available continuously as an artifact of the [Actions](https://gitea.angry.im/PeterCxy/OpenEUICC/actions) CI used by this project. However, these debug-mode APKs are **not** intended for inclusion inside system images, nor are they supported by the developer in any sense. If you are a custom ROM developer, either include the entire OpenEUICC repository in your AOSP source tree, or generate an APK using `gradle` and import that as a prebuilt system app. Note that you might want `privapp_whitelist_im.angry.openeuicc.xml` as well.
+- A: Debug-mode APKs and Magisk modules are available continuously as an artifact of the [Actions](https://gitea.angry.im/PeterCxy/OpenEUICC/actions) CI used by this project. However, these debug-mode APKs are **not** intended for inclusion inside system images, nor are they supported by the developer in any sense. If you are a custom ROM developer, either include the entire OpenEUICC repository in your AOSP source tree, or generate an APK using `gradle` and import that as a prebuilt system app. Note that you might want `privapp_whitelist_im.angry.openeuicc.xml` as well.
-
-- Q: AOSP's Settings app seems to be confused by OpenEUICC (for example, disabling / enabling profiles from the Networks page do not work properly)
-- A: When your device has internal eSIM chip(s) __and__ you have inserted a removable eSIM chip, the Settings app can misbehave since it was never designed for this scenario. __Please prefer using OpenEUICC's own management interface whenever possible.__ In the future, there might be an option to exclude removable SIMs from being reported to the Android system.
 
 - Q: Can EasyEUICC manage my phone's internal eSIM?
 - A: No. For EasyEUICC to work, the eSIM chip MUST proactively grant access via its ARA-M field.

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

@@ -123,7 +123,13 @@ class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
             add(Item(R.string.euicc_info_pp_version, info.ppVersion.toString()))
             info.sasAccreditationNumber.trim().takeIf(RE_SAS::matches)
                 ?.let { add(Item(R.string.euicc_info_sas_accreditation_number, it.uppercase())) }
-            add(Item(R.string.euicc_info_free_nvram, info.freeNvram.let(::formatFreeSpace)))
+
+            val nvramText = buildString {
+                append(formatFreeSpace(info.freeNvram))
+                append(' ')
+                append(getString(R.string.euicc_info_free_nvram_hint))
+            }
+            add(Item(R.string.euicc_info_free_nvram, nvramText))
         }
         channel.lpa.euiccInfo2?.euiccCiPKIdListForSigning.orEmpty().let { signers ->
             // SGP.28 v1.0, eSIM CI Registration Criteria (Page 5 of 9, 2019-10-24)

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

@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
+import androidx.annotation.StringRes
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -42,19 +43,17 @@ class DownloadWizardProgressFragment : DownloadWizardActivity.DownloadWizardStep
     }
 
     private data class ProgressItem(
-        val titleRes: Int,
+        @StringRes val titleRes: Int,
-        var state: ProgressState
+        var state: ProgressState = ProgressState.NotStarted,
+        var errorMessage: SimplifiedErrorMessages? = null,
     )
 
     private val progressItems = arrayOf(
-        ProgressItem(R.string.download_wizard_progress_step_preparing, ProgressState.NotStarted),
+        ProgressItem(R.string.download_wizard_progress_step_preparing),
-        ProgressItem(R.string.download_wizard_progress_step_connecting, ProgressState.NotStarted),
+        ProgressItem(R.string.download_wizard_progress_step_connecting),
-        ProgressItem(
+        ProgressItem(R.string.download_wizard_progress_step_authenticating),
-            R.string.download_wizard_progress_step_authenticating,
+        ProgressItem(R.string.download_wizard_progress_step_downloading),
-            ProgressState.NotStarted
+        ProgressItem(R.string.download_wizard_progress_step_finalizing)
-        ),
-        ProgressItem(R.string.download_wizard_progress_step_downloading, ProgressState.NotStarted),
-        ProgressItem(R.string.download_wizard_progress_step_finalizing, ProgressState.NotStarted)
     )
 
     private val adapter = ProgressItemAdapter()
@@ -122,8 +121,13 @@ class DownloadWizardProgressFragment : DownloadWizardActivity.DownloadWizardStep
                         // Change the state of the last InProgress item to success (or error)
                         progressItems.forEachIndexed { index, progressItem ->
                             if (progressItem.state == ProgressState.InProgress) {
-                                progressItem.state =
+                                if (state.downloadError == null) {
-                                    if (state.downloadError == null) ProgressState.Done else ProgressState.Error
+                                    progressItem.state = ProgressState.Done
+                                } else {
+                                    progressItem.state = ProgressState.Error
+                                    progressItem.errorMessage =
+                                        SimplifiedErrorMessages.fromDownloadError(state.downloadError!!)
+                                }
                             }
 
                             adapter.notifyItemChanged(index)
@@ -133,9 +137,8 @@ class DownloadWizardProgressFragment : DownloadWizardActivity.DownloadWizardStep
                         refreshButtons()
                     }
 
-                    is EuiccChannelManagerService.ForegroundTaskState.InProgress -> {
+                    is EuiccChannelManagerService.ForegroundTaskState.InProgress ->
                         updateProgress(it.progress)
-                    }
 
                     else -> {}
                 }
@@ -197,9 +200,15 @@ class DownloadWizardProgressFragment : DownloadWizardActivity.DownloadWizardStep
         private val progressBar =
             root.requireViewById<ProgressBar>(R.id.download_progress_icon_progress)
         private val icon = root.requireViewById<ImageView>(R.id.download_progress_icon)
+        private val errorTitle =
+            root.requireViewById<TextView>(R.id.download_progress_item_error_title)
+        private val errorSuggestion =
+            root.requireViewById<TextView>(R.id.download_progress_item_error_suggestion)
 
         fun bind(item: ProgressItem) {
             title.text = getString(item.titleRes)
+            errorTitle.visibility = View.GONE
+            errorSuggestion.visibility = View.GONE
 
             when (item.state) {
                 ProgressState.NotStarted -> {
@@ -222,6 +231,15 @@ class DownloadWizardProgressFragment : DownloadWizardActivity.DownloadWizardStep
                     progressBar.visibility = View.GONE
                     icon.setImageResource(R.drawable.ic_error_outline)
                     icon.visibility = View.VISIBLE
+
+                    item.errorMessage?.titleResId?.let {
+                        errorTitle.visibility = View.VISIBLE
+                        errorTitle.text = getString(it)
+                    }
+                    item.errorMessage?.suggestResId?.let {
+                        errorSuggestion.visibility = View.VISIBLE
+                        errorSuggestion.text = getString(it)
+                    }
                 }
             }
         }

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

@@ -0,0 +1,154 @@
+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
+
+enum class SimplifiedErrorMessages(
+    @StringRes val titleResId: Int,
+    @StringRes val suggestResId: Int?
+) {
+    ICCIDAlreadyInUse(
+        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
+    ),
+    EIDNotSupported(
+        R.string.download_wizard_error_eid_not_supported,
+        R.string.download_wizard_error_suggest_contact_carrier
+    ),
+    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
+    );
+
+    companion object {
+        private val httpErrors = buildMap {
+            // Stage: AuthenticateClient
+            put("8.1" to "4.8", InsufficientMemory)
+            put("8.1.1" to "2.1", EIDNotSupported)
+            put("8.1.1" to "3.8", EIDMismatch)
+            put("8.2" to "1.2", UnreleasedProfile)
+            put("8.2.6" to "3.8", MatchingIDRefused)
+            put("8.8.5" to "6.4", ProfileRetriesExceeded)
+
+            // Stage: GetBoundProfilePackage
+            put("8.2.7" to "2.2", ConfirmationCodeMissing)
+            put("8.2.7" to "3.8", ConfirmationCodeRefused)
+            put("8.2.7" to "6.4", ConfirmationCodeRetriesExceeded)
+
+            // Stage: AuthenticateClient, GetBoundProfilePackage
+            put("8.8.5" to "4.10", ProfileExpired)
+        }
+
+        fun fromDownloadError(exc: LocalProfileAssistant.ProfileDownloadException) = when {
+            exc.lpaErrorReason != "ES10B_ERROR_REASON_UNDEFINED" -> fromLPAErrorReason(exc.lpaErrorReason)
+            exc.lastHttpResponse?.rcode == 200 -> fromHTTPResponse(exc.lastHttpResponse!!)
+            exc.lastHttpException != null -> fromHTTPException(exc.lastHttpException!!)
+            exc.lastApduResponse != null -> fromAPDUResponse(exc.lastApduResponse!!)
+            else -> null
+        }
+
+        private fun fromLPAErrorReason(reason: String) = when (reason) {
+            "ES10B_ERROR_REASON_UNSUPPORTED_CRT_VALUES" -> UnsupportedProfile
+            "ES10B_ERROR_REASON_UNSUPPORTED_REMOTE_OPERATION_TYPE" -> UnsupportedProfile
+            "ES10B_ERROR_REASON_UNSUPPORTED_PROFILE_CLASS" -> UnsupportedProfile
+            "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_ICCID_ALREADY_EXISTS_ON_EUICC" -> ICCIDAlreadyInUse
+            "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_INSUFFICIENT_MEMORY_FOR_PROFILE" -> InsufficientMemory
+            "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_INTERRUPTION" -> CardInternalError
+            "ES10B_ERROR_REASON_INSTALL_FAILED_DUE_TO_PE_PROCESSING_ERROR" -> CardInternalError
+            else -> null
+        }
+
+        private fun fromHTTPResponse(httpResponse: net.typeblog.lpac_jni.HttpInterface.HttpResponse): SimplifiedErrorMessages? {
+            if (httpResponse.data.first().toInt() != '{'.code) return null
+            val response = JSONObject(httpResponse.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 fromHTTPException(exc: Exception) = when (exc) {
+            is SSLException -> TLSError
+            is UnknownHostException -> UnknownHost
+            is NoRouteToHostException -> NetworkUnreachable
+            is PortUnreachableException -> NetworkUnreachable
+            is SocketTimeoutException -> NetworkUnreachable
+            is SocketException -> exc.message
+                ?.contains("Connection reset", ignoreCase = true)
+                ?.let { if (it) NetworkUnreachable else null }
+
+            else -> null
+        }
+
+        private fun fromAPDUResponse(resp: ByteArray): SimplifiedErrorMessages? {
+            val isSuccess = resp.size >= 2 &&
+                    resp[resp.size - 2] == 0x90.toByte() &&
+                    resp[resp.size - 1] == 0x00.toByte()
+            if (isSuccess) return null
+            return CardInternalError
+        }
+    }
+}

app-common/src/main/res/layout/download_progress_item.xml

@@ -1,30 +1,32 @@
 <?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="wrap_content"
+    android:layout_height="wrap_content">
-    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <TextView
         android:id="@+id/download_progress_item_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="20dp"
+        android:layout_marginHorizontal="20dp"
         android:textSize="14sp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/download_progress_icon_container"
         app:layout_constrainedWidth="true"
-        app:layout_constraintHorizontal_bias="0.0" />
+        app:layout_constraintBottom_toBottomOf="@id/download_progress_icon_container"
+        app:layout_constraintEnd_toStartOf="@id/download_progress_icon_container"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/download_progress_icon_container"
+        app:layout_constraintVertical_bias="0.5" />
 
     <FrameLayout
         android:id="@+id/download_progress_icon_container"
-        android:layout_margin="20dp"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_margin="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0">
 
         <ProgressBar
             android:id="@+id/download_progress_icon_progress"
@@ -42,4 +44,38 @@
 
     </FrameLayout>
 
+    <TextView
+        android:id="@+id/download_progress_item_error_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="10dp"
+        android:textColor="?attr/colorError"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toTopOf="@id/download_progress_item_error_suggestion"
+        app:layout_constraintEnd_toStartOf="@id/download_progress_icon_container"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/download_progress_item_title" />
+
+    <TextView
+        android:id="@+id/download_progress_item_error_suggestion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:textColor="?attr/colorError"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/download_progress_icon_container"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/download_progress_item_title" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -6,6 +6,7 @@
     <string name="euicc_info_unavailable">情報がありません</string>
     <string name="notification_help">ヘルプ</string>
     <string name="profile_reload_slots">スロットを再読み込み</string>
+    <string name="profile_no_enabled_profile">未知</string>
     <string name="channel_name_format">論理スロット %d</string>
     <string name="profile_state_enabled">有効済み</string>
     <string name="profile_state_disabled">無効済み</string>
@@ -83,6 +84,7 @@
     <string name="download_wizard_diagnostics_last_apdu_exception">最終の APDU 例外:</string>
     <string name="download_wizard_diagnostics_save">保存</string>
     <string name="download_wizard_diagnostics_file_template">「%s」での診断</string>
+    <string name="download_wizard_error_suggest_network_unreachable">別のネットワークに接続し（例：Wi-Fi とデータを切り替える）、もう一度お試しください。</string>
     <string name="logs_saved_message">ログは共有したパスに保存されました。別のアプリで共有しますか？</string>
     <string name="profile_rename_new_name">新しいニックネーム</string>
     <string name="profile_rename_encoding_error">ニックネームを UTF-8 にエンコードできませんでした</string>
@@ -114,6 +116,7 @@
     <string name="euicc_info_sas_accreditation_number">SAS 認定番号</string>
     <string name="euicc_info_pp_version">保護されたプロファイルのバージョン</string>
     <string name="euicc_info_free_nvram">NVRAM の空き容量 (eSIM プロファイルストレージ)</string>
+    <string name="euicc_info_free_nvram_hint">（目安）</string>
     <string name="euicc_info_ci_type">証明書発行者 (CI)</string>
     <string name="euicc_info_ci_gsma_live">GSMA ライブ CI</string>
     <string name="euicc_info_ci_gsma_test">GSMA テスト CI</string>
@@ -150,6 +153,7 @@
     <string name="pref_developer_ignore_tls_certificate">SM-DP+ TLS 証明書を無視する</string>
     <string name="pref_developer_ignore_tls_certificate_desc">RSP サーバーで使用される TLS 証明書を受け入れます</string>
     <string name="pref_developer_isdr_aid_list_desc">一部のブランドの取り外し可能な eUICC では、独自の非標準 ISD-R AID が使用されている場合があり、サードパーティ アプリからアクセスできなくなります。アプリはこのリストに追加された非標準の AID の使用を試みる可能性がありますが、動作することは保証されません。</string>
+    <string name="pref_developer_es10x_mss_desc">グローバル ES10x MSS</string>
     <string name="pref_info">情報</string>
     <string name="pref_info_app_version">アプリバージョン</string>
     <string name="pref_info_source_code">ソースコード</string>
@@ -169,4 +173,24 @@
     <string name="pref_developer_isdr_aid_list">ISD-R AID リストのカスタマイズ</string>
     <string name="isdr_aid_list_restore_defaults">リセット</string>
     <string name="isdr_aid_list">ISD-R AID リスト</string>
+    <string name="download_wizard_error_iccid_already">この eSIM プロファイルはすでに eSIM チップに存在しています。</string>
+    <string name="download_wizard_error_insufficient_memory">eSIM チップには十分なメモリ容量が残っていません。</string>
+    <string name="download_wizard_error_unsupported_profile">この eSIM プロファイルは、ダウンロード先のeSIM チップではサポートされていません。</string>
+    <string name="download_wizard_error_card_internal_error">eSIMチップでエラーが発生しました。</string>
+    <string name="download_wizard_error_eid_not_supported">お使いのデバイスまたは eSIM チップの EID は、通信事業者によってサポートされていません。</string>
+    <string name="download_wizard_error_eid_mismatch">この eSIM プロファイルはすでに別のデバイスにダウンロードされています。</string>
+    <string name="download_wizard_error_profile_unreleased">この eSIM プロファイルはキャンセルされました。</string>
+    <string name="download_wizard_error_matching_id_refused">アクティベーションコードが無効です。</string>
+    <string name="download_wizard_error_profile_retries_exceeded">eSIM プロファイルのダウンロード試行回数の上限を超えました。</string>
+    <string name="download_wizard_error_confirmation_code_missing">このプロファイルをダウンロードするには確認コードが必要です。</string>
+    <string name="download_wizard_error_confirmation_code_refused">入力した確認コードは無効です。</string>
+    <string name="download_wizard_error_profile_expired">この eSIM プロファイルの有効期限が切れています。</string>
+    <string name="download_wizard_error_confirmation_code_retries_exceeded">確認コードのダウンロード試行回数の上限を超えました。</string>
+    <string name="download_wizard_error_unknown_hostname">不明なSM-DP+アドレス</string>
+    <string name="download_wizard_error_network_unreachable">ネットワークにアクセスできません</string>
+    <string name="download_wizard_error_tls_certificate">TLS証明書エラー。このeSIMプロファイルはサポートされていません</string>
+    <string name="download_wizard_error_suggest_profile_installed">すでにダウンロードしたeSIMプロファイルを再インストールしようとしています</string>
+    <string name="download_wizard_error_suggest_insufficient_memory">不要なeSIMプロファイルをいくつか削除して、もう一度お試しください</string>
+    <string name="download_wizard_error_suggest_contact_carrier">通信事業者にお問い合わせください。</string>
+    <string name="download_wizard_error_suggest_contact_reissue">この eSIM プロファイルを再発行するには、通信事業者にお問い合わせください。</string>
 </resources>

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

@@ -5,6 +5,7 @@
     <string name="euicc_info_unknown">未知</string>
     <string name="notification_help">帮助</string>
     <string name="profile_reload_slots">重新加载卡槽</string>
+    <string name="profile_no_enabled_profile">未知</string>
     <string name="channel_name_format">逻辑卡槽 %d</string>
     <string name="profile_state_enabled">已启用</string>
     <string name="profile_state_disabled">已禁用</string>
@@ -46,6 +47,7 @@
     <string name="profile_download_imei">IMEI (可选)</string>
     <string name="profile_download_low_nvram_title">剩余空间不足</string>
     <string name="profile_download_low_nvram_message">当前芯片的剩余空间不足，可能导致配置下载失败。\n是否继续下载？</string>
+    <string name="download_wizard_error_suggest_network_unreachable">请连接到其他网络（例如在 Wi-Fi 和数据之间切换）后重试。</string>
     <string name="logs_saved_message">日志已保存到指定路径。需要通过其他 App 分享吗？</string>
     <string name="profile_rename_new_name">新昵称</string>
     <string name="profile_rename_encoding_error">无法将昵称编码为 UTF-8</string>
@@ -83,6 +85,7 @@
     <string name="pref_advanced_logs">日志</string>
     <string name="pref_advanced_logs_desc">查看应用程序的最新调试日志</string>
     <string name="pref_developer_isdr_aid_list_desc">某些品牌的可移除 eUICC 可能会使用自己的非标准 ISD-R AID，导致第三方应用无法访问。此 App 可以尝试使用此列表中添加的非标准 AID，但不能保证它们一定有效。</string>
+    <string name="pref_developer_es10x_mss_desc">全局 ES10x MSS</string>
     <string name="pref_info">信息</string>
     <string name="pref_info_app_version">App 版本</string>
     <string name="pref_info_source_code">源码</string>
@@ -136,6 +139,7 @@
     <string name="euicc_info_sas_accreditation_number">SAS 认证号码</string>
     <string name="euicc_info_pp_version">Protected Profile 版本</string>
     <string name="euicc_info_free_nvram">NVRAM 剩余空间 (eSIM 存储容量)</string>
+    <string name="euicc_info_free_nvram_hint">（仅供参考）</string>
     <string name="euicc_info_ci_type">证书签发者 (CI)</string>
     <string name="euicc_info_ci_gsma_live">GSMA 生产环境 CI</string>
     <string name="euicc_info_ci_gsma_test">GSMA 测试 CI</string>
@@ -169,4 +173,24 @@
     <string name="pref_developer_isdr_aid_list">自定义 ISD-R AID 列表</string>
     <string name="isdr_aid_list_restore_defaults">重置</string>
     <string name="isdr_aid_list">ISD-R AID 列表</string>
+    <string name="download_wizard_error_iccid_already">此 eSIM 配置文件已存在于您的 eSIM 芯片上。</string>
+    <string name="download_wizard_error_insufficient_memory">您的 eSIM 芯片没有足够的空间来下载配置文件。</string>
+    <string name="download_wizard_error_unsupported_profile">您的 eSIM 芯片不支持此 eSIM 配置文件。</string>
+    <string name="download_wizard_error_card_internal_error">eSIM 芯片错误。</string>
+    <string name="download_wizard_error_eid_not_supported">您的设备或 eSIM 芯片的 EID 不受您的运营商支持。</string>
+    <string name="download_wizard_error_eid_mismatch">此 eSIM 配置文件已被下载到另一台设备上。</string>
+    <string name="download_wizard_error_profile_unreleased">此 eSIM 配置文件已被撤销。</string>
+    <string name="download_wizard_error_matching_id_refused">激活码无效。</string>
+    <string name="download_wizard_error_profile_retries_exceeded">已超出 eSIM 配置文件的最大下载尝试次数。</string>
+    <string name="download_wizard_error_confirmation_code_missing">下载此配置文件需要确认码。</string>
+    <string name="download_wizard_error_confirmation_code_refused">您输入的确认码无效。</string>
+    <string name="download_wizard_error_profile_expired">此 eSIM 配置文件已过期。</string>
+    <string name="download_wizard_error_confirmation_code_retries_exceeded">已超出确认码的最大下载尝试次数。</string>
+    <string name="download_wizard_error_unknown_hostname">未知的 SM-DP+ 地址</string>
+    <string name="download_wizard_error_network_unreachable">网络不可达</string>
+    <string name="download_wizard_error_tls_certificate">TLS 证书错误，不支持此 eSIM 配置文件</string>
+    <string name="download_wizard_error_suggest_profile_installed">您正在尝试重新安装已下载的 eSIM 配置文件</string>
+    <string name="download_wizard_error_suggest_insufficient_memory">请删除一些未使用的 eSIM 配置文件，然后重试</string>
+    <string name="download_wizard_error_suggest_contact_carrier">请联系您的运营商寻求帮助。</string>
+    <string name="download_wizard_error_suggest_contact_reissue">请联系您的运营商重新签发此 eSIM 配置文件。</string>
 </resources>

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

@@ -5,6 +5,7 @@
     <string name="euicc_info_unknown">未知</string>
     <string name="notification_help">幫助</string>
     <string name="profile_reload_slots">重新載入卡槽</string>
+    <string name="profile_no_enabled_profile">未知</string>
     <string name="channel_name_format">虛擬卡槽 %d</string>
     <string name="profile_state_enabled">已啟用</string>
     <string name="profile_state_disabled">已停用</string>
@@ -46,6 +47,7 @@
     <string name="profile_download_imei">IMEI (可選)</string>
     <string name="profile_download_low_nvram_title">剩餘空間不足</string>
     <string name="profile_download_low_nvram_message">目前晶片的剩餘空間不足，可能導致配置下載失敗。\n是否繼續下載？</string>
+    <string name="download_wizard_error_suggest_network_unreachable">請連接到其他網路（例如在 Wi-Fi 和資料之間切換）後重試。</string>
     <string name="logs_saved_message">日誌已儲存到指定路徑。需要透過其他 App 分享嗎？</string>
     <string name="profile_rename_new_name">新名稱</string>
     <string name="profile_rename_encoding_error">無法將名稱編碼為 UTF-8</string>
@@ -83,6 +85,7 @@
     <string name="pref_advanced_disable_safeguard_removable_esim">允許 停用/刪除 已啟用的設定檔</string>
     <string name="pref_advanced_disable_safeguard_removable_esim_desc">預設情況下，此應用程式會阻止您停用可插拔 eSIM 中已啟用的設定檔。\n因為這樣做 <i>有時</i> 會導致無法存取。\n勾選此框以 <i>移除</i> 此保護措施。</string>
     <string name="pref_developer_isdr_aid_list_desc">某些品牌的可移除 eUICC 可能會使用自己的非標準 ISD-R AID，導致第三方應用程式無法存取。此 App 可以嘗試使用此清單中新增的非標準 AID，但不能保證它們一定有效。</string>
+    <string name="pref_developer_es10x_mss_desc">全局 ES10x MSS</string>
     <string name="pref_info">資訊</string>
     <string name="pref_info_app_version">App 版本</string>
     <string name="pref_info_source_code">原始碼</string>
@@ -136,6 +139,7 @@
     <string name="euicc_info_sas_accreditation_number">SAS 認證號碼</string>
     <string name="euicc_info_pp_version">Protected Profile 版本</string>
     <string name="euicc_info_free_nvram">NVRAM 剩餘空間 (eSIM 儲存容量)</string>
+    <string name="euicc_info_free_nvram_hint">（僅供參考）</string>
     <string name="euicc_info_ci_type">證書簽發者 (CI)</string>
     <string name="euicc_info_ci_gsma_live">GSMA 生產環境 CI</string>
     <string name="euicc_info_ci_gsma_test">GSMA 測試 CI</string>
@@ -169,4 +173,24 @@
     <string name="pref_developer_isdr_aid_list">自訂 ISD-R AID 列表</string>
     <string name="isdr_aid_list_restore_defaults">重置</string>
     <string name="isdr_aid_list">ISD-R AID 列表</string>
+    <string name="download_wizard_error_iccid_already">此 eSIM 設定檔已存在於您的 eSIM 晶片上。</string>
+    <string name="download_wizard_error_insufficient_memory">您的 eSIM 晶片沒有足夠的空間來下載設定檔。</string>
+    <string name="download_wizard_error_unsupported_profile">您的 eSIM 晶片不支援此 eSIM 設定檔。</string>
+    <string name="download_wizard_error_card_internal_error">eSIM 晶片錯誤。</string>
+    <string name="download_wizard_error_eid_not_supported">您的裝置或 eSIM 晶片的 EID 不受您的電信業者支援。</string>
+    <string name="download_wizard_error_eid_mismatch">此 eSIM 設定檔已被下載到另一台裝置上。</string>
+    <string name="download_wizard_error_profile_unreleased">此 eSIM 設定檔已被撤銷。</string>
+    <string name="download_wizard_error_matching_id_refused">啟用碼無效。</string>
+    <string name="download_wizard_error_profile_retries_exceeded">已超出 eSIM 設定檔的最大下載嘗試次數。</string>
+    <string name="download_wizard_error_confirmation_code_missing">下載此設定檔需要確認碼。</string>
+    <string name="download_wizard_error_confirmation_code_refused">您輸入的確認碼無效。</string>
+    <string name="download_wizard_error_profile_expired">此 eSIM 設定檔已過期。</string>
+    <string name="download_wizard_error_confirmation_code_retries_exceeded">已超出確認碼的最大下載嘗試次數。</string>
+    <string name="download_wizard_error_unknown_hostname">未知的 SM-DP+ 位址</string>
+    <string name="download_wizard_error_network_unreachable">網路不可達</string>
+    <string name="download_wizard_error_tls_certificate">TLS 憑證錯誤，不支援此 eSIM 設定檔</string>
+    <string name="download_wizard_error_suggest_profile_installed">您正在嘗試重新安裝已下載的 eSIM 設定文件</string>
+    <string name="download_wizard_error_suggest_insufficient_memory">請刪除一些未使用的 eSIM 設定文件，然後重試</string>
+    <string name="download_wizard_error_suggest_contact_carrier">請聯絡您的電信業者尋求協助。</string>
+    <string name="download_wizard_error_suggest_contact_reissue">請聯絡您的電信業者重新簽發此 eSIM 設定檔。</string>
 </resources>

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

@@ -104,6 +104,27 @@
     <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 already present on your eSIM chip.</string>
+    <string name="download_wizard_error_insufficient_memory">Your eSIM chip does not have sufficient memory left to download the profile.</string>
+    <string name="download_wizard_error_unsupported_profile">This eSIM profile is unsupported by your eSIM chip.</string>
+    <string name="download_wizard_error_card_internal_error">An error occurred in your eSIM chip.</string>
+    <string name="download_wizard_error_eid_not_supported">The EID of your device or eSIM chip is unsupported by your carrier.</string>
+    <string name="download_wizard_error_eid_mismatch">This eSIM profile has been downloaded on another device.</string>
+    <string name="download_wizard_error_profile_unreleased">This eSIM profile has been revoked.</string>
+    <string name="download_wizard_error_matching_id_refused">The activation code is invalid.</string>
+    <string name="download_wizard_error_profile_retries_exceeded">The maximum number of download attempts for the eSIM profile has been exceeded.</string>
+    <string name="download_wizard_error_confirmation_code_missing">Confirmation code is required to download this profile.</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 expired.</string>
+    <string name="download_wizard_error_confirmation_code_retries_exceeded">The maximum number of download attempts 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">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 downloaded eSIM profile</string>
+    <string name="download_wizard_error_suggest_insufficient_memory">Please delete some unused eSIM profiles 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">Please try again after connecting to a different network (e.g. switching between Wi-Fi and data).</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>
 
@@ -144,6 +165,7 @@
     <string name="euicc_info_sas_accreditation_number">SAS Accreditation Number</string>
     <string name="euicc_info_pp_version">Protected Profile Version</string>
     <string name="euicc_info_free_nvram">Free NVRAM (eSIM profile storage)</string>
+    <string name="euicc_info_free_nvram_hint">(for reference only)</string>
     <string name="euicc_info_ci_type">Certificate Issuer (CI)</string>
     <string name="euicc_info_ci_gsma_live">GSMA Live CI</string>
     <string name="euicc_info_ci_gsma_test">GSMA Test CI</string>
@@ -200,7 +222,7 @@
     <string name="pref_developer_ignore_tls_certificate_desc">Accept any TLS certificate used by the RSP server</string>
     <string name="pref_developer_euicc_memory_reset">Allow erasing eUICC</string>
     <string name="pref_developer_euicc_memory_reset_desc">This is a dangerous operation and hidden by default. As an alternative, you can delete all profiles manually.</string>
-    <string name="pref_developer_es10x_mss">ES10x MSS</string>
+    <string name="pref_developer_es10x_mss" translatable="false">ES10x MSS</string>
     <string name="pref_developer_es10x_mss_desc">Global ES10x MSS</string>
     <string-array name="pref_developer_es10x_entry_keys">
         <item>High Speed</item>

libs/lpac-jni/src/main/java/net/typeblog/lpac_jni/impl/LocalProfileAssistantImpl.kt

@@ -11,12 +11,14 @@ import net.typeblog.lpac_jni.LocalProfileInfo
 import net.typeblog.lpac_jni.LocalProfileNotification
 import net.typeblog.lpac_jni.ProfileDownloadCallback
 import net.typeblog.lpac_jni.Version
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.concurrent.withLock
 
 class LocalProfileAssistantImpl(
     isdrAid: ByteArray,
     rawApduInterface: ApduInterface,
     rawHttpInterface: HttpInterface
-): LocalProfileAssistant {
+) : LocalProfileAssistant {
     companion object {
         private const val TAG = "LocalProfileAssistantImpl"
     }
@@ -74,6 +76,10 @@ class LocalProfileAssistantImpl(
             }
     }
 
+    // Controls concurrency of every single method in this class, since
+    // the C-side is explicitly NOT thread-safe
+    private val lock = ReentrantLock()
+
     private val apduInterface = ApduInterfaceWrapper(rawApduInterface)
     private val httpInterface = HttpInterfaceWrapper(rawHttpInterface)
 
@@ -105,15 +111,15 @@ class LocalProfileAssistantImpl(
         }
 
     override val profiles: List<LocalProfileInfo>
-        @Synchronized
+        get() = lock.withLock {
-        get() {
             val head = LpacJni.es10cGetProfilesInfo(contextHandle)
             var curr = head
             val ret = mutableListOf<LocalProfileInfo>()
             while (curr != 0L) {
                 val state = LocalProfileInfo.State.fromString(LpacJni.profileGetStateString(curr))
                 val clazz = LocalProfileInfo.Clazz.fromString(LpacJni.profileGetClassString(curr))
-                ret.add(LocalProfileInfo(
+                ret.add(
+                    LocalProfileInfo(
                         LpacJni.profileGetIccid(curr),
                         state,
                         LpacJni.profileGetName(curr),
@@ -121,7 +127,8 @@ class LocalProfileAssistantImpl(
                         LpacJni.profileGetServiceProvider(curr),
                         LpacJni.profileGetIsdpAid(curr),
                         clazz
-                ))
+                    )
+                )
                 curr = LpacJni.profilesNext(curr)
             }
 
@@ -130,35 +137,43 @@ class LocalProfileAssistantImpl(
         }
 
     override val notifications: List<LocalProfileNotification>
-        @Synchronized
+        get() = lock.withLock {
-        get() {
             val head = LpacJni.es10bListNotification(contextHandle)
             var curr = head
+
+            try {
                 val ret = mutableListOf<LocalProfileNotification>()
                 while (curr != 0L) {
-                ret.add(LocalProfileNotification(
+                    ret.add(
+                        LocalProfileNotification(
                             LpacJni.notificationGetSeq(curr),
-                    LocalProfileNotification.Operation.fromString(LpacJni.notificationGetOperationString(curr)),
+                            LocalProfileNotification.Operation.fromString(
+                                LpacJni.notificationGetOperationString(
+                                    curr
+                                )
+                            ),
                             LpacJni.notificationGetAddress(curr),
                             LpacJni.notificationGetIccid(curr),
-                ))
+                        )
+                    )
                     curr = LpacJni.notificationsNext(curr)
                 }
-            LpacJni.notificationsFree(head)
                 return ret.sortedBy { it.seqNumber }.reversed()
+            } finally {
+                LpacJni.notificationsFree(head)
+            }
         }
 
     override val eID: String
-        @Synchronized
+        get() = lock.withLock { LpacJni.es10cGetEid(contextHandle)!! }
-        get() = LpacJni.es10cGetEid(contextHandle)!!
 
     override val euiccInfo2: EuiccInfo2?
-        @Synchronized
+        get() = lock.withLock {
-        get() {
             val cInfo = LpacJni.es10cexGetEuiccInfo2(contextHandle)
             if (cInfo == 0L) return null
 
-            val ret = EuiccInfo2(
+            try {
+                return EuiccInfo2(
                     Version(LpacJni.euiccInfo2GetSGP22Version(cInfo)),
                     Version(LpacJni.euiccInfo2GetProfileVersion(cInfo)),
                     Version(LpacJni.euiccInfo2GetEuiccFirmwareVersion(cInfo)),
@@ -182,27 +197,27 @@ class LocalProfileAssistantImpl(
                         }
                     },
                 )
-
+            } finally {
                 LpacJni.euiccInfo2Free(cInfo)
-
+            }
-            return ret
         }
 
-    @Synchronized
+    override fun enableProfile(iccid: String, refresh: Boolean): Boolean = lock.withLock {
-    override fun enableProfile(iccid: String, refresh: Boolean): Boolean =
         LpacJni.es10cEnableProfile(contextHandle, iccid, refresh) == 0
+    }
 
-    @Synchronized
+    override fun disableProfile(iccid: String, refresh: Boolean): Boolean = lock.withLock {
-    override fun disableProfile(iccid: String, refresh: Boolean): Boolean =
         LpacJni.es10cDisableProfile(contextHandle, iccid, refresh) == 0
+    }
 
-    @Synchronized
+    override fun deleteProfile(iccid: String): Boolean = lock.withLock {
-    override fun deleteProfile(iccid: String): Boolean =
         LpacJni.es10cDeleteProfile(contextHandle, iccid) == 0
+    }
 
-    @Synchronized
+    override fun downloadProfile(
-    override fun downloadProfile(smdp: String, matchingId: String?, imei: String?,
+        smdp: String, matchingId: String?, imei: String?,
-                                 confirmationCode: String?, callback: ProfileDownloadCallback) {
+        confirmationCode: String?, callback: ProfileDownloadCallback
+    ) = lock.withLock {
         val res = LpacJni.downloadProfile(
             contextHandle,
             smdp,
@@ -229,18 +244,17 @@ class LocalProfileAssistantImpl(
         }
     }
 
-    @Synchronized
+    override fun deleteNotification(seqNumber: Long): Boolean = lock.withLock {
-    override fun deleteNotification(seqNumber: Long): Boolean =
         LpacJni.es10bDeleteNotification(contextHandle, seqNumber) == 0
+    }
 
-    @Synchronized
+    override fun handleNotification(seqNumber: Long): Boolean = lock.withLock {
-    override fun handleNotification(seqNumber: Long): Boolean =
         LpacJni.handleNotification(contextHandle, seqNumber).also {
             Log.d(TAG, "handleNotification $seqNumber = $it")
         } == 0
+    }
 
-    @Synchronized
+    override fun setNickname(iccid: String, nickname: String) = lock.withLock {
-    override fun setNickname(iccid: String, nickname: String) {
         val encoded = try {
             Charsets.UTF_8.encode(nickname).array()
         } catch (e: CharacterCodingException) {
@@ -259,11 +273,12 @@ class LocalProfileAssistantImpl(
     }
 
     override fun euiccMemoryReset() {
+        lock.withLock {
             LpacJni.es10cEuiccMemoryReset(contextHandle)
         }
+    }
 
-    @Synchronized
+    override fun close() = lock.withLock {
-    override fun close() {
         if (!finalized) {
             LpacJni.euiccFini(contextHandle)
             LpacJni.destroyContext(contextHandle)