Add Magisk uninstall script

.idea/.gitignore

@@ -2,7 +2,7 @@
 /caches
 /libraries
 /assetWizardSettings.xml
-/deploymentTarget*.xml
+/deploymentTargetDropDown.xml
 /gradle.xml
 /misc.xml
 /modules.xml

.idea/deploymentTargetSelector.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app-unpriv">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="app-unpriv.androidTest">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="app-unpriv.main">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="app-unpriv.unitTest">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="app.unitTest">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="app.androidTest">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="app.main">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="workspace.OpenEUICC.app-unpriv">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="workspace.OpenEUICC.app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>

app-common/src/main/java/im/angry/openeuicc/core/DefaultEuiccChannelFactory.kt

@@ -21,7 +21,7 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
     override suspend fun tryOpenEuiccChannel(
         port: UiccPortInfoCompat,
         isdrAid: ByteArray
-    ): EuiccChannel? = try {
+    ): EuiccChannel? {
         if (port.portIndex != 0) {
             Log.w(
                 DefaultEuiccChannelManager.TAG,
@@ -35,52 +35,58 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
             DefaultEuiccChannelManager.TAG,
             "Trying OMAPI for physical slot ${port.card.physicalSlotIndex}"
         )
-        EuiccChannelImpl(
+        try {
-            context.getString(R.string.channel_type_omapi),
+            return EuiccChannelImpl(
-            port,
+                context.getString(R.string.channel_type_omapi),
-            intrinsicChannelName = null,
-            OmapiApduInterface(
-                seService!!,
                 port,
-                context.preferenceRepository.verboseLoggingFlow
+                intrinsicChannelName = null,
-            ),
+                OmapiApduInterface(
-            isdrAid,
+                    seService!!,
-            context.preferenceRepository.verboseLoggingFlow,
+                    port,
-            context.preferenceRepository.ignoreTLSCertificateFlow,
+                    context.preferenceRepository.verboseLoggingFlow
-            context.preferenceRepository.es10xMssFlow,
+                ),
-        )
+                isdrAid,
-    } catch (_: IllegalArgumentException) {
+                context.preferenceRepository.verboseLoggingFlow,
-        // Failed
+                context.preferenceRepository.ignoreTLSCertificateFlow,
-        Log.w(
+            ).also {
-            DefaultEuiccChannelManager.TAG,
+                Log.i(DefaultEuiccChannelManager.TAG, "Is OMAPI channel, setting MSS to 60")
-            "OMAPI APDU interface unavailable for physical slot ${port.card.physicalSlotIndex} with ISD-R AID: ${isdrAid.encodeHex()}."
+                it.lpa.setEs10xMss(60)
-        )
+            }
-        null
+        } catch (_: IllegalArgumentException) {
+            // Failed
+            Log.w(
+                DefaultEuiccChannelManager.TAG,
+                "OMAPI APDU interface unavailable for physical slot ${port.card.physicalSlotIndex} with ISD-R AID: ${isdrAid.encodeHex()}."
+            )
+        }
+
+        return null
     }
 
     override fun tryOpenUsbEuiccChannel(
         ccidCtx: UsbCcidContext,
         isdrAid: ByteArray
-    ): EuiccChannel? = try {
+    ): EuiccChannel? {
-        EuiccChannelImpl(
+        try {
-            context.getString(R.string.channel_type_usb),
+            return EuiccChannelImpl(
-            FakeUiccPortInfoCompat(FakeUiccCardInfoCompat(EuiccChannelManager.USB_CHANNEL_ID)),
+                context.getString(R.string.channel_type_usb),
-            intrinsicChannelName = ccidCtx.productName,
+                FakeUiccPortInfoCompat(FakeUiccCardInfoCompat(EuiccChannelManager.USB_CHANNEL_ID)),
-            UsbApduInterface(
+                intrinsicChannelName = ccidCtx.productName,
-                ccidCtx
+                UsbApduInterface(
-            ),
+                    ccidCtx
-            isdrAid,
+                ),
-            context.preferenceRepository.verboseLoggingFlow,
+                isdrAid,
-            context.preferenceRepository.ignoreTLSCertificateFlow,
+                context.preferenceRepository.verboseLoggingFlow,
-            context.preferenceRepository.es10xMssFlow,
+                context.preferenceRepository.ignoreTLSCertificateFlow,
-        )
+            )
-    } catch (_: IllegalArgumentException) {
+        } catch (_: IllegalArgumentException) {
-        // Failed
+            // Failed
-        Log.w(
+            Log.w(
-            DefaultEuiccChannelManager.TAG,
+                DefaultEuiccChannelManager.TAG,
-            "USB APDU interface unavailable for ISD-R AID: ${isdrAid.encodeHex()}."
+                "USB APDU interface unavailable for ISD-R AID: ${isdrAid.encodeHex()}."
-        )
+            )
-        null
+        }
+        return null
     }
 
     override fun cleanup() {

app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelImpl.kt

@@ -1,9 +1,8 @@
 package im.angry.openeuicc.core
 
 import im.angry.openeuicc.util.UiccPortInfoCompat
+import im.angry.openeuicc.util.decodeHex
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import net.typeblog.lpac_jni.ApduInterface
 import net.typeblog.lpac_jni.LocalProfileAssistant
 import net.typeblog.lpac_jni.impl.HttpInterfaceImpl
@@ -16,8 +15,7 @@ class EuiccChannelImpl(
     override val apduInterface: ApduInterface,
     override val isdrAid: ByteArray,
     verboseLoggingFlow: Flow<Boolean>,
-    ignoreTLSCertificateFlow: Flow<Boolean>,
+    ignoreTLSCertificateFlow: Flow<Boolean>
-    es10xMssFlow: Flow<Int>,
 ) : EuiccChannel {
     override val slotId = port.card.physicalSlotIndex
     override val logicalSlotId = port.logicalSlotIndex
@@ -27,10 +25,8 @@ class EuiccChannelImpl(
         LocalProfileAssistantImpl(
             isdrAid,
             apduInterface,
-            HttpInterfaceImpl(verboseLoggingFlow, ignoreTLSCertificateFlow),
+            HttpInterfaceImpl(verboseLoggingFlow, ignoreTLSCertificateFlow)
-        ).also {
+        )
-            it.setEs10xMss(runBlocking { es10xMssFlow.first().toByte() })
-        }
 
     override val atr: ByteArray?
         get() = (apduInterface as? ApduInterfaceAtrProvider)?.atr

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

@@ -123,13 +123,7 @@ 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/SettingsFragment.kt

@@ -8,7 +8,6 @@ import android.provider.Settings
 import android.widget.Toast
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.CheckBoxPreference
-import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
@@ -17,6 +16,7 @@ import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 
 open class SettingsFragment: PreferenceFragmentCompat() {
     private lateinit var developerPref: PreferenceCategory
@@ -34,7 +34,7 @@ open class SettingsFragment: PreferenceFragmentCompat() {
         // Show / hide developer preference based on whether it is enabled
         lifecycleScope.launch {
             preferenceRepository.developerOptionsEnabledFlow
-                .onEach(developerPref::setVisible)
+                .onEach { developerPref.isVisible = it }
                 .collect()
         }
 
@@ -84,9 +84,6 @@ open class SettingsFragment: PreferenceFragmentCompat() {
         requirePreference<CheckBoxPreference>("pref_developer_euicc_memory_reset")
             .bindBooleanFlow(preferenceRepository.euiccMemoryResetFlow)
 
-        requirePreference<ListPreference>("pref_developer_es10x_mss")
-            .bindIntFlow(preferenceRepository.es10xMssFlow, 63)
-
         requirePreference<Preference>("pref_developer_isdr_aid_list").apply {
             intent = Intent(requireContext(), IsdrAidListActivity::class.java)
         }
@@ -103,53 +100,51 @@ open class SettingsFragment: PreferenceFragmentCompat() {
     @Suppress("UNUSED_PARAMETER")
     private fun onAppVersionClicked(pref: Preference): Boolean {
         if (developerPref.isVisible) return false
-
         val now = System.currentTimeMillis()
-        numClicks = if (now - lastClickTimestamp >= 1000) 1 else numClicks + 1
+        if (now - lastClickTimestamp >= 1000) {
+            numClicks = 1
+        } else {
+            numClicks++
+        }
         lastClickTimestamp = now
 
-        lifecycleScope.launch {
+        if (numClicks == 7) {
-            preferenceRepository.developerOptionsEnabledFlow.updatePreference(numClicks >= 7)
+            lifecycleScope.launch {
+                preferenceRepository.developerOptionsEnabledFlow.updatePreference(true)
+
+                lastToast?.cancel()
+                Toast.makeText(
+                    requireContext(),
+                    R.string.developer_options_enabled,
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        } else if (numClicks > 1) {
+            lastToast?.cancel()
+            lastToast = Toast.makeText(
+                requireContext(),
+                getString(R.string.developer_options_steps, 7 - numClicks),
+                Toast.LENGTH_SHORT
+            )
+            lastToast!!.show()
         }
 
-        val toastText = when {
-            numClicks == 7 -> getString(R.string.developer_options_enabled)
-            numClicks > 1 -> getString(R.string.developer_options_steps, 7 - numClicks)
-            else -> return true
-        }
-
-        lastToast?.cancel()
-        lastToast = Toast.makeText(requireContext(), toastText, Toast.LENGTH_SHORT)
-        lastToast!!.show()
         return true
     }
 
     protected fun CheckBoxPreference.bindBooleanFlow(flow: PreferenceFlowWrapper<Boolean>) {
         lifecycleScope.launch {
-            flow.collect(::setChecked)
+            flow.collect { isChecked = it }
         }
 
         setOnPreferenceChangeListener { _, newValue ->
-            lifecycleScope.launch {
+            runBlocking {
                 flow.updatePreference(newValue as Boolean)
             }
             true
         }
     }
 
-    private fun ListPreference.bindIntFlow(flow: PreferenceFlowWrapper<Int>, defaultValue: Int) {
-        lifecycleScope.launch {
-            flow.collect { value = it.toString() }
-        }
-
-        setOnPreferenceChangeListener { _, newValue ->
-            lifecycleScope.launch {
-                flow.updatePreference((newValue as String).toIntOrNull() ?: defaultValue)
-            }
-            true
-        }
-    }
-
     protected fun mergePreferenceOverlay(overlayKey: String, targetKey: String) {
         val overlayCat = requirePreference<PreferenceCategory>(overlayKey)
         val targetCat = requirePreference<PreferenceCategory>(targetKey)

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

@@ -43,36 +43,18 @@ class DownloadWizardProgressFragment : DownloadWizardActivity.DownloadWizardStep
 
     private data class ProgressItem(
         val titleRes: Int,
-        var state: ProgressState,
+        var state: ProgressState
-        var errorMessage: SimplifiedErrorMessages?,
     )
 
     private val progressItems = arrayOf(
-        ProgressItem(
+        ProgressItem(R.string.download_wizard_progress_step_preparing, ProgressState.NotStarted),
-            R.string.download_wizard_progress_step_preparing,
+        ProgressItem(R.string.download_wizard_progress_step_connecting, ProgressState.NotStarted),
-            ProgressState.NotStarted,
-            null
-        ),
-        ProgressItem(
-            R.string.download_wizard_progress_step_connecting,
-            ProgressState.NotStarted,
-            null
-        ),
         ProgressItem(
             R.string.download_wizard_progress_step_authenticating,
-            ProgressState.NotStarted,
+            ProgressState.NotStarted
-            null
         ),
-        ProgressItem(
+        ProgressItem(R.string.download_wizard_progress_step_downloading, ProgressState.NotStarted),
-            R.string.download_wizard_progress_step_downloading,
+        ProgressItem(R.string.download_wizard_progress_step_finalizing, ProgressState.NotStarted)
-            ProgressState.NotStarted,
-            null
-        ),
-        ProgressItem(
-            R.string.download_wizard_progress_step_finalizing,
-            ProgressState.NotStarted,
-            null
-        )
     )
 
     private val adapter = ProgressItemAdapter()
@@ -140,13 +122,8 @@ 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) {
-                                if (state.downloadError == null) {
+                                progressItem.state =
-                                    progressItem.state = ProgressState.Done
+                                    if (state.downloadError == null) ProgressState.Done else ProgressState.Error
-                                } else {
-                                    progressItem.state = ProgressState.Error
-                                    progressItem.errorMessage =
-                                        SimplifiedErrorMessages.fromDownloadError(state.downloadError!!)
-                                }
                             }
 
                             adapter.notifyItemChanged(index)
@@ -220,15 +197,9 @@ 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 -> {
@@ -251,16 +222,6 @@ class DownloadWizardProgressFragment : DownloadWizardActivity.DownloadWizardStep
                     progressBar.visibility = View.GONE
                     icon.setImageResource(R.drawable.ic_error_outline)
                     icon.visibility = View.VISIBLE
-
-                    if (item.errorMessage != null) {
-                        errorTitle.visibility = View.VISIBLE
-                        errorTitle.text = getString(item.errorMessage!!.titleResId)
-
-                        if (item.errorMessage!!.suggestResId != null) {
-                            errorSuggestion.visibility = View.VISIBLE
-                            errorSuggestion.text = getString(item.errorMessage!!.suggestResId!!)
-                        }
-                    }
                 }
             }
         }

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

@@ -1,154 +0,0 @@
-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/java/im/angry/openeuicc/util/PreferenceUtils.kt

@@ -5,7 +5,6 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import androidx.fragment.app.Fragment
@@ -39,7 +38,6 @@ internal object PreferenceKeys {
     val IGNORE_TLS_CERTIFICATE = booleanPreferencesKey("ignore_tls_certificate")
     val EUICC_MEMORY_RESET = booleanPreferencesKey("euicc_memory_reset")
     val ISDR_AID_LIST = stringPreferencesKey("isdr_aid_list")
-    val ES10X_MSS = intPreferencesKey("es10x_mss")
 }
 
 const val EUICC_DEFAULT_ISDR_AID = "A0000005591010FFFFFFFF8900000100"
@@ -91,7 +89,6 @@ open class PreferenceRepository(private val context: Context) {
         PreferenceConstants.DEFAULT_AID_LIST,
         { Base64.getEncoder().encodeToString(it.encodeToByteArray()) },
         { Base64.getDecoder().decode(it).decodeToString() })
-    val es10xMssFlow = bindFlow(PreferenceKeys.ES10X_MSS, 63)
 
     protected fun <T> bindFlow(
         key: Preferences.Key<T>,

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

@@ -1,32 +1,30 @@
 <?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_marginHorizontal="20dp"
+        android:layout_margin="20dp"
         android:textSize="14sp"
-        app:layout_constrainedWidth="true"
+        app:layout_constraintTop_toTopOf="parent"
-        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_constraintBottom_toBottomOf="parent"
-        app:layout_constraintVertical_bias="0.5" />
+        app:layout_constraintEnd_toStartOf="@id/download_progress_icon_container"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintHorizontal_bias="0.0" />
 
     <FrameLayout
         android:id="@+id/download_progress_icon_container"
+        android:layout_margin="20dp"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        android:layout_margin="20dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
 
         <ProgressBar
             android:id="@+id/download_progress_icon_progress"
@@ -44,38 +42,4 @@
 
     </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,7 +6,6 @@
     <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>
@@ -84,7 +83,6 @@
     <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>
@@ -116,7 +114,6 @@
     <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>
@@ -153,7 +150,6 @@
     <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>
@@ -173,24 +169,4 @@
     <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,7 +5,6 @@
     <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>
@@ -47,7 +46,6 @@
     <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>
@@ -85,7 +83,6 @@
     <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>
@@ -139,7 +136,6 @@
     <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>
@@ -173,24 +169,4 @@
     <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,7 +5,6 @@
     <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>
@@ -47,7 +46,6 @@
     <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>
@@ -85,7 +83,6 @@
     <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>
@@ -139,7 +136,6 @@
     <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>
@@ -173,24 +169,4 @@
     <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,27 +104,6 @@
     <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>
 
@@ -165,7 +144,6 @@
     <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>
@@ -222,16 +200,6 @@
     <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" 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>
-        <item>Compatibility Mode</item>
-    </string-array>
-    <string-array name="pref_developer_es10x_entry_values" translatable="false">
-        <item>255</item>
-        <item>63</item>
-    </string-array>
     <string name="pref_developer_isdr_aid_list">Customize ISD-R AID list</string>
     <string name="pref_developer_isdr_aid_list_desc">Some brands of removable eUICCs may use their own non-standard ISD-R AID, rendering them inaccessible to third-party apps. We can attempt to use non-standard AIDs added in this list, but there is no guarantee that they will work.</string>
     <string name="pref_info">Info</string>

app-common/src/main/res/xml/pref_settings.xml

@@ -81,14 +81,6 @@
             app:summary="@string/pref_developer_euicc_memory_reset_desc"
             app:title="@string/pref_developer_euicc_memory_reset" />
 
-        <ListPreference
-            app:iconSpaceReserved="false"
-            app:key="pref_developer_es10x_mss"
-            app:summary="@string/pref_developer_es10x_mss_desc"
-            app:title="@string/pref_developer_es10x_mss"
-            app:entries="@array/pref_developer_es10x_entry_keys"
-            app:entryValues="@array/pref_developer_es10x_entry_values" />
-
         <Preference
             app:iconSpaceReserved="false"
             app:key="pref_developer_isdr_aid_list"

app/build.gradle.kts

@@ -77,7 +77,6 @@ tasks.register<MagiskModuleDirTask>("assembleDebugMagiskModuleDir") {
     moduleProp = modulePropsTemplate.let {
         it["description"] = "(debug build) ${it["description"]}"
         it["versionCode"] = "${(android.applicationVariants.find { it.name == "debug" }!!.outputs.first() as ApkVariantOutputImpl).versionCodeOverride}"
-        it["updateJson"] = "https://openeuicc.com/magisk/magisk-debug.json"
         it
     }
     dependsOn("assembleDebug")

app/src/main/java/im/angry/openeuicc/core/PrivilegedEuiccChannelFactory.kt

@@ -42,7 +42,6 @@ class PrivilegedEuiccChannelFactory(context: Context) : DefaultEuiccChannelFacto
                     isdrAid,
                     context.preferenceRepository.verboseLoggingFlow,
                     context.preferenceRepository.ignoreTLSCertificateFlow,
-                    context.preferenceRepository.es10xMssFlow,
                 )
             } catch (_: IllegalArgumentException) {
                 // Failed