refactor: sim toolkit

app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedEuiccManagementFragment.kt

@@ -29,36 +29,23 @@ class UnprivilegedEuiccManagementFragment : EuiccManagementFragment() {
         super.onCreateOptionsMenu(menu, inflater)
         inflater.inflate(R.menu.fragment_sim_toolkit, menu)
         menu.findItem(R.id.open_sim_toolkit).apply {
-            isVisible = stk.isAvailable(slotId)
+            val slot = stk[slotId] ?: return@apply
-            setOnMenuItemClickListener { launchSIMToolkit() }
+            isVisible = slot.intent != null
+            setOnMenuItemClickListener {
+                val intent = slot.intent ?: return@setOnMenuItemClickListener false
+                if (intent.action == Settings.ACTION_APPLICATION_DETAILS_SETTINGS) {
+                    val packageName = intent.data!!.schemeSpecificPart
+                    val label = requireContext().packageManager.getApplicationLabel(packageName)
+                    val message = requireContext().getString(R.string.toast_prompt_to_enable_sim_toolkit, label)
+                    Toast.makeText(context, message, Toast.LENGTH_LONG).show()
                 }
-    }
-
-    private fun launchSIMToolkit(): Boolean {
-        val intent = stk.intent(slotId)
-        val disabledPackageName = stk.getDisabledPackageName(slotId)
-        if (disabledPackageName == null && intent != null) {
                 startActivity(intent)
-            return true
+                true
-        } else if (disabledPackageName != null) {
+            }
-            val context = requireContext()
-            val appInfo = context.packageManager
-                .getApplicationInfo(disabledPackageName, PackageManager.GET_ACTIVITIES)
-            val toast = Toast.makeText(
-                context,
-                getString(
-                    R.string.toast_hint_enable_sim_toolkit,
-                    context.packageManager.getApplicationLabel(appInfo)
-                ),
-                Toast.LENGTH_LONG,
-            )
-            startActivity(Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
-                data = Uri.fromParts("package", disabledPackageName, null)
-            })
-            toast.show()
-            return true
-        } else {
-            return false
         }
     }
 }
+
+
+private fun PackageManager.getApplicationLabel(packageName: String): CharSequence =
+    getApplicationLabel(getApplicationInfo(packageName, 0))

app-unpriv/src/main/java/im/angry/openeuicc/util/SIMToolkit.kt

@@ -1,92 +1,92 @@
 package im.angry.openeuicc.util
 
-import android.app.Activity
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
+import android.net.Uri
+import android.provider.Settings
+import android.widget.Toast
 import androidx.annotation.ArrayRes
 import im.angry.easyeuicc.R
 import im.angry.openeuicc.core.EuiccChannelManager
 
 class SIMToolkit(private val context: Context) {
-    private val pm: PackageManager
-        get() = context.packageManager
-
-    private val slotSelection = getComponentNames(R.array.sim_toolkit_slot_selection)
-
     private val slots = buildMap {
+        fun getComponentNames(@ArrayRes id: Int) = context.resources
+            .getStringArray(id).mapNotNull(ComponentName::unflattenFromString)
+        put(-1, getComponentNames(R.array.sim_toolkit_slot_selection))
         put(0, getComponentNames(R.array.sim_toolkit_slot_1))
         put(1, getComponentNames(R.array.sim_toolkit_slot_2))
     }
 
-    private val packageNames = buildSet {
+    operator fun get(slotId: Int): Slot? = when (slotId) {
-        addAll(slotSelection.map { it.packageName })
+        -1, EuiccChannelManager.USB_CHANNEL_ID -> null
-        addAll(slots.values.flatten().map { it.packageName })
+        else -> Slot(context, buildSet {
+            addAll(slots.getOrDefault(slotId, emptySet()))
+            addAll(slots.getOrDefault(-1, emptySet()))
+        })
     }
 
-    private val activities: Iterable<ComponentName>
+    data class Slot(private val context: Context, private val components: Set<ComponentName>) {
-        get() = packageNames.flatMap(::getActivities).toSet()
+        private val packageManager: PackageManager
+            get() = context.packageManager
+
+        private val packageNames: Iterable<String>
+            get() = components.map(ComponentName::getPackageName).toSet()
 
         private val launchIntent: Intent?
-        get() = packageNames.firstNotNullOfOrNull(::getLaunchIntent)
+            get() = packageNames.firstNotNullOfOrNull(packageManager::getLaunchIntent)
 
-    private fun getLaunchIntent(packageName: String) = try {
+        private val activities: Iterable<ComponentName>
-        pm.getLaunchIntentForPackage(packageName)
+            get() = packageNames.flatMap(packageManager::getActivities)
-    } catch (_: PackageManager.NameNotFoundException) {
+                .filter(ActivityInfo::exported).map { ComponentName(it.packageName, it.name) }
-        null
-    }
 
-    private fun getActivities(packageName: String) = buildList {
+        private fun getActivityIntent(): Intent? {
-        val activities = try {
-            pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES).activities ?: emptyArray()
-        } catch (_: PackageManager.NameNotFoundException) {
-            emptyArray()
-        }
             for (activity in activities) {
-            if (!activity.exported) continue
+                if (!components.contains(activity)) continue
-            add(ComponentName(packageName, activity.name))
+                if (isDisabledState(packageManager.getComponentEnabledSetting(activity))) continue
+                return Intent.makeMainActivity(activity)
             }
+            return launchIntent
         }
 
-    private fun getComponentNames(@ArrayRes id: Int) =
+        private fun getDisabledPackageIntent(): Intent? {
-        context.resources.getStringArray(id).mapNotNull(ComponentName::unflattenFromString)
+            val disabledPackageName = packageNames.find {
-
+                try {
-    fun isAvailable(slotId: Int) = when (slotId) {
+                    isDisabledState(packageManager.getApplicationEnabledSetting(it))
-        -1 -> false
+                } catch (_: IllegalArgumentException) {
-        EuiccChannelManager.USB_CHANNEL_ID -> false
+                    false
-        else -> intent(slotId) != null || getDisabledPackageName(slotId) != null
+                }
+            }
+            if (disabledPackageName == null) return null
+            return Intent(
+                Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+                Uri.fromParts("package", disabledPackageName, null)
+            )
         }
 
-    fun intent(slotId: Int): Intent? {
+        val intent: Intent?
-        val components = slots.getOrDefault(slotId, emptySet()) + slotSelection
+            get() = getActivityIntent() ?: getDisabledPackageIntent()
-        val intent = Intent(Intent.ACTION_MAIN, null).apply {
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            component = components.find(activities::contains)
-            addCategory(Intent.CATEGORY_LAUNCHER)
-        }
-        return when (pm.getComponentEnabledSetting(intent.component ?: return launchIntent)) {
-            PackageManager.COMPONENT_ENABLED_STATE_ENABLED -> intent
-            else -> null
-        }
     }
+}
 
-    fun getDisabledPackageName(slotId: Int): String? {
+private fun isDisabledState(state: Int) = when (state) {
-        val packageNames = buildSet {
-            addAll(slots.getOrDefault(slotId, emptySet()).map { it.packageName })
-            addAll(slotSelection.map { it.packageName })
-        }
-        return packageNames.find {
-            val enabledState = try {
-                pm.getApplicationEnabledSetting(it)
-            } catch (e: IllegalArgumentException) {
-                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
-            }
-            when (enabledState) {
     PackageManager.COMPONENT_ENABLED_STATE_DISABLED -> true
     PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER -> true
     else -> false
-            }
+}
-        }
+
-    }
+private fun PackageManager.getLaunchIntent(packageName: String) = try {
+    getLaunchIntentForPackage(packageName)
+} catch (_: PackageManager.NameNotFoundException) {
+    null
+}
+
+private fun PackageManager.getActivities(packageName: String) = try {
+    getPackageInfo(packageName, PackageManager.GET_ACTIVITIES)
+        .activities?.toList() ?: emptyList()
+} catch (_: PackageManager.NameNotFoundException) {
+    emptyList()
 }

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

@@ -9,7 +9,7 @@
 
     <!-- Toast -->
     <string name="toast_ara_m_copied">ARA-M SHA-1 copied to clipboard</string>
-    <string name="toast_hint_enable_sim_toolkit">Please ENABLE your "%s" application</string>
+    <string name="toast_prompt_to_enable_sim_toolkit">Please ENABLE your \"%s\" application</string>
 
     <!-- Compatibility Check Descriptions -->
     <string name="compatibility_check_system_features">System Features</string>