[9/n] MainActivity: format channel names in UI code instead

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

@@ -10,7 +10,6 @@ abstract class EuiccChannel(
     val logicalSlotId = port.logicalSlotIndex
     val portId = port.portIndex
     val cardId = port.card.cardId
-    val name = "SLOT $logicalSlotId"
     val removable = port.card.isRemovable
     val isMEP = port.card.isMultipleEnabledProfilesSupported
 

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

@@ -80,7 +80,7 @@ open class MainActivity : AppCompatActivity() {
         withContext(Dispatchers.IO) {
             manager.enumerateEuiccChannels()
             manager.knownChannels.forEach {
-                Log.d(TAG, it.name)
+                Log.d(TAG, "slot ${it.slotId} port ${it.portId}")
                 Log.d(TAG, it.lpa.eID)
                 // Request the system to refresh the list of profiles every time we start
                 // Note that this is currently supposed to be no-op when unprivileged,
@@ -90,8 +90,8 @@ open class MainActivity : AppCompatActivity() {
         }
 
         withContext(Dispatchers.Main) {
-            manager.knownChannels.forEach { channel ->
-                spinnerAdapter.add(channel.name)
+            manager.knownChannels.sortedBy { it.logicalSlotId }.forEach { channel ->
+                spinnerAdapter.add(getString(R.string.channel_name_format, channel.logicalSlotId))
                 fragments.add(createEuiccManagementFragment(channel))
             }
 

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

@@ -3,6 +3,8 @@
     <string name="no_euicc">No eUICC card on this device is accessible by this app.\nInsert a supported eUICC card, or try out the privileged OpenEUICC app instead.</string>
     <string name="unknown">Unknown</string>
 
+    <string name="channel_name_format">Logical Slot %d</string>
+
     <string name="enabled">Enabled</string>
     <string name="disabled">Disabled</string>
     <string name="provider">Provider:</string>