Compare commits

..

1 commit

Author SHA1 Message Date
da396dd99d
refactor: sim toolkit 2025-03-05 19:53:42 +08:00
2 changed files with 2 additions and 7 deletions

View file

@ -1,8 +1,6 @@
package im.angry.openeuicc.ui package im.angry.openeuicc.ui
import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.net.Uri
import android.provider.Settings import android.provider.Settings
import android.view.Menu import android.view.Menu
import android.view.MenuInflater import android.view.MenuInflater

View file

@ -23,16 +23,13 @@ class SIMToolkit(private val context: Context) {
operator fun get(slotId: Int): Slot? = when (slotId) { operator fun get(slotId: Int): Slot? = when (slotId) {
-1, EuiccChannelManager.USB_CHANNEL_ID -> null -1, EuiccChannelManager.USB_CHANNEL_ID -> null
else -> Slot(context, buildSet { else -> Slot(context.packageManager, buildSet {
addAll(slots.getOrDefault(slotId, emptySet())) addAll(slots.getOrDefault(slotId, emptySet()))
addAll(slots.getOrDefault(-1, emptySet())) addAll(slots.getOrDefault(-1, emptySet()))
}) })
} }
data class Slot(private val context: Context, private val components: Set<ComponentName>) { data class Slot(private val packageManager: PackageManager, private val components: Set<ComponentName>) {
private val packageManager: PackageManager
get() = context.packageManager
private val packageNames: Iterable<String> private val packageNames: Iterable<String>
get() = components.map(ComponentName::getPackageName).toSet() get() = components.map(ComponentName::getPackageName).toSet()