Compare commits

...

1 commit

Author SHA1 Message Date
56c0c9f0af
fix: crash (priv) 2025-03-13 11:58:13 +08:00
2 changed files with 5 additions and 13 deletions

View file

@ -10,9 +10,8 @@ import java.lang.IllegalArgumentException
class PrivilegedEuiccChannelFactory(context: Context) : DefaultEuiccChannelFactory(context), class PrivilegedEuiccChannelFactory(context: Context) : DefaultEuiccChannelFactory(context),
PrivilegedEuiccContextMarker { PrivilegedEuiccContextMarker {
private val tm by lazy { override val openEuiccMarkerContext: Context
(context.applicationContext as OpenEuiccApplication).appContainer.telephonyManager get() = context
}
@Suppress("NAME_SHADOWING") @Suppress("NAME_SHADOWING")
override suspend fun tryOpenEuiccChannel(port: UiccPortInfoCompat): EuiccChannel? { override suspend fun tryOpenEuiccChannel(port: UiccPortInfoCompat): EuiccChannel? {
@ -35,7 +34,7 @@ class PrivilegedEuiccChannelFactory(context: Context) : DefaultEuiccChannelFacto
intrinsicChannelName = null, intrinsicChannelName = null,
TelephonyManagerApduInterface( TelephonyManagerApduInterface(
port, port,
tm, telephonyManager,
context.preferenceRepository.verboseLoggingFlow context.preferenceRepository.verboseLoggingFlow
), ),
context.preferenceRepository.verboseLoggingFlow, context.preferenceRepository.verboseLoggingFlow,

View file

@ -10,16 +10,9 @@ import java.util.concurrent.Executors
import kotlin.coroutines.resume import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine import kotlin.coroutines.suspendCoroutine
interface PrivilegedEuiccContextMarker { interface PrivilegedEuiccContextMarker : OpenEuiccContextMarker {
val privilegedEuiccMarkerContext: Context
get() = when (this) {
is Context -> this
is Fragment -> requireContext()
else -> throw RuntimeException("PrivilegedEuiccContextMarker shall only be used on Fragments or UI types that derive from Context")
}
val preferenceRepository: PrivilegedPreferenceRepository val preferenceRepository: PrivilegedPreferenceRepository
get() = privilegedEuiccMarkerContext.preferenceRepository as PrivilegedPreferenceRepository get() = openEuiccMarkerContext.preferenceRepository as PrivilegedPreferenceRepository
} }
suspend fun Context.bindServiceSuspended(intent: Intent, flags: Int): Pair<IBinder?, () -> Unit> = suspend fun Context.bindServiceSuspended(intent: Intent, flags: Int): Pair<IBinder?, () -> Unit> =