From 22d4017eec9714bd1aa57c7013435425c361ca14 Mon Sep 17 00:00:00 2001 From: septs Date: Tue, 12 Nov 2024 09:34:33 +0800 Subject: [PATCH] fix: crash with disable com.android.stk app --- .../java/im/angry/openeuicc/util/SIMToolkit.kt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) 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 148e932..ced813a 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 @@ -34,13 +34,16 @@ class SIMToolkit(private val context: Context) { null } - private fun getActivities(packageName: String) = try { - val pm = context.packageManager - val packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES) - packageInfo.activities!!.filter { it.exported } - .map { ComponentName(it.packageName, it.name) } - } catch (_: PackageManager.NameNotFoundException) { - emptyList() + private fun getActivities(packageName: String): List { + return try { + val pm = context.packageManager + val packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES) + val activities = packageInfo.activities + if (activities.isNullOrEmpty()) return emptyList() + activities.filter { it.exported }.map { ComponentName(it.packageName, it.name) } + } catch (_: PackageManager.NameNotFoundException) { + emptyList() + } } private fun getComponentNames(@ArrayRes id: Int) = -- 2.45.3