chore: add preference item

see https://developer.android.com/build/build-variants

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

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

@@ -35,8 +35,8 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
             DefaultEuiccChannelManager.TAG,
             "Trying OMAPI for physical slot ${port.card.physicalSlotIndex}"
         )
-        try {
+        return try {
-            return EuiccChannelImpl(
+            EuiccChannelImpl(
                 context.getString(R.string.channel_type_omapi),
                 port,
                 intrinsicChannelName = null,
@@ -48,19 +48,15 @@ open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccCha
                 isdrAid,
                 context.preferenceRepository.verboseLoggingFlow,
                 context.preferenceRepository.ignoreTLSCertificateFlow,
-            ).also {
+            )
-                Log.i(DefaultEuiccChannelManager.TAG, "Is OMAPI channel, setting MSS to 60")
-                it.lpa.setEs10xMss(60)
-            }
         } catch (_: IllegalArgumentException) {
             // Failed
             Log.w(
                 DefaultEuiccChannelManager.TAG,
                 "OMAPI APDU interface unavailable for physical slot ${port.card.physicalSlotIndex} with ISD-R AID: ${isdrAid.encodeHex()}."
             )
+            null
         }
-
-        return null
     }
 
     override fun tryOpenUsbEuiccChannel(

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

@@ -99,6 +99,12 @@ open class DefaultEuiccChannelManager(
             val channel =
                 tryOpenChannelFirstValidAid { euiccChannelFactory.tryOpenEuiccChannel(port, it) }
 
+            if (channel != null) {
+                val mss = context.preferenceRepository.es10xMssFlow.first()
+                Log.i(TAG, "Set ${channel.type} channel, ES10x MSS to $mss")
+                channel.lpa.setEs10xMss(mss.toByte())
+            }
+
             if (channel != null) {
                 channelCache.add(channel)
                 return channel

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

@@ -8,6 +8,7 @@ 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
@@ -16,7 +17,6 @@ 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
@@ -84,6 +84,9 @@ 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)
         }
@@ -138,13 +141,26 @@ open class SettingsFragment: PreferenceFragmentCompat() {
         }
 
         setOnPreferenceChangeListener { _, newValue ->
-            runBlocking {
+            lifecycleScope.launch {
                 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/util/PreferenceUtils.kt

@@ -5,6 +5,7 @@ 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
@@ -38,6 +39,7 @@ 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"
@@ -50,9 +52,12 @@ internal object PreferenceConstants {
         # eUICC standard
         $EUICC_DEFAULT_ISDR_AID
 
-        # eSTK.me
+        # ESTKme AUX (deprecated, use SE0 instead)
         A06573746B6D65FFFFFFFF4953442D52
 
+        # ESTKme SE0
+        A06573746B6D65FFFF4953442D522030
+
         # eSIM.me
         A0000005591010000000008900000300
 
@@ -86,6 +91,7 @@ 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/values/strings.xml

@@ -200,6 +200,16 @@
     <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_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,6 +81,14 @@
             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"
@@ -96,12 +104,14 @@
         <Preference
             app:iconSpaceReserved="false"
             app:title="@string/pref_info_app_version"
+            app:enableCopying="true"
             app:key="pref_info_app_version" />
 
         <Preference
             app:iconSpaceReserved="false"
             app:title="@string/pref_info_source_code"
             app:summary="@string/pref_info_source_code_url"
+            app:enableCopying="true"
             app:key="pref_info_source_code">
             <intent
                 android:action="android.intent.action.VIEW"

app-unpriv/build.gradle.kts

@@ -27,6 +27,9 @@ android {
     }
 
     buildTypes {
+        defaultConfig {
+            versionNameSuffix = "-unpriv"
+        }
         release {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")

app/build.gradle.kts

@@ -23,6 +23,9 @@ android {
     }
 
     buildTypes {
+        defaultConfig {
+            versionNameSuffix = "-priv"
+        }
         release {
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")

buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt

@@ -16,7 +16,7 @@ val Project.gitVersionCode: Int
                 standardOutput = stdout
             }
             stdout.toString("utf-8").trim('\n').toInt()
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             0
         }
 
@@ -29,7 +29,7 @@ val Project.gitVersionName: String
                 standardOutput = stdout
             }
             stdout.toString("utf-8").trim('\n')
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             "Unknown"
         }
 
@@ -38,7 +38,7 @@ class MyVersioningPlugin: Plugin<Project> {
         target.configure<BaseAppModuleExtension> {
             defaultConfig {
                 versionCode = target.gitVersionCode
-                versionName = target.gitVersionName
+                versionName = target.gitVersionName.removePrefix("unpriv-")
             }
 
             applicationVariants.all {

libs/lpac-jni/src/main/jni/Application.mk

@@ -1,4 +1,5 @@
 APP_ABI := all
 APP_SHORT_COMMANDS := true
 APP_CFLAGS := -Wno-compound-token-split-by-macro
-APP_LDFLAGS := -Wl,--build-id=none -z muldefs
+APP_LDFLAGS := -Wl,--build-id=none -z muldefs
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

libs/lpac-jni/src/main/jni/lpac-jni.mk

@@ -1,4 +1,5 @@
 LOCAL_PATH := $(call my-dir)
+LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384"
 
 # function to find all *.c files under a directory
 define all-c-files-under