diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedEuiccManagementFragment.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedEuiccManagementFragment.kt index 617cbec..1ceeba3 100644 --- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedEuiccManagementFragment.kt +++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedEuiccManagementFragment.kt @@ -1,6 +1,8 @@ package im.angry.openeuicc.ui +import android.content.Intent import android.content.pm.PackageManager +import android.net.Uri import android.provider.Settings import android.view.Menu import android.view.MenuInflater diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/util/SIMToolkit.kt b/app-unpriv/src/main/java/im/angry/openeuicc/util/SIMToolkit.kt index 99824ff..418b1aa 100644 --- a/app-unpriv/src/main/java/im/angry/openeuicc/util/SIMToolkit.kt +++ b/app-unpriv/src/main/java/im/angry/openeuicc/util/SIMToolkit.kt @@ -23,13 +23,16 @@ class SIMToolkit(private val context: Context) { operator fun get(slotId: Int): Slot? = when (slotId) { -1, EuiccChannelManager.USB_CHANNEL_ID -> null - else -> Slot(context.packageManager, buildSet { + else -> Slot(context, buildSet { addAll(slots.getOrDefault(slotId, emptySet())) addAll(slots.getOrDefault(-1, emptySet())) }) } - data class Slot(private val packageManager: PackageManager, private val components: Set) { + data class Slot(private val context: Context, private val components: Set) { + private val packageManager: PackageManager + get() = context.packageManager + private val packageNames: Iterable get() = components.map(ComponentName::getPackageName).toSet()