PeterCxy/OpenEUICC
16
29
Fork 20
Code Issues 7 Pull requests 4 Projects Releases 8 Wiki Activity Actions

fix: use customizableTextProvider in getCompatibilityCheckResult #203

Open
septs wants to merge 2 commits from septs/OpenEUICC:format-channel-name-in-compatibility-check into master
pull from: septs/OpenEUICC:format-channel-name-in-compatibility-check
merge into: PeterCxy:master
Conversation 0 Commits 2 Files changed 1 +10 -7
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt
View file

@ -127,8 +127,9 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
if (!service.isConnected) { if (!service.isConnected) {
return CompatibilityResult(Compatibility.NOT_COMPATIBLE) return CompatibilityResult(Compatibility.NOT_COMPATIBLE)
} }
val omapiSlots = service.readers.filter { it.isSIM }.map { it.slotIndex } val readers = service.readers.filter(Reader::isSIM)
val slots = service.readers.filter { it.isSIM }.mapNotNull { reader -> val omapiSlots = readers.mapNotNull(Reader::slotIndex)
val slots = readers.mapNotNull { reader ->
try { try {
// Note: we ONLY check the default ISD-R AID, because this test is for the _device_, // Note: we ONLY check the default ISD-R AID, because this test is for the _device_,
// NOT the eUICC. We don't care what AID a potential eUICC might use, all we need to // NOT the eUICC. We don't care what AID a potential eUICC might use, all we need to
@ -147,10 +148,12 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
if (omapiSlots.isEmpty()) { if (omapiSlots.isEmpty()) {
return CompatibilityResult(Compatibility.NOT_COMPATIBLE) return CompatibilityResult(Compatibility.NOT_COMPATIBLE)
} }
val formatChannelName = appContainer.customizableTextProvider::formatInternalChannelName
return CompatibilityResult( return CompatibilityResult(
Compatibility.COMPATIBLE, Compatibility.COMPATIBLE,
slotsOmapi = omapiSlots.map { "SIM$it" }, slotsOmapi = omapiSlots.map(formatChannelName),
slotsIsdr = slots.map { "SIM$it" }) slotsIsdr = slots.map(formatChannelName),
)
} }
open fun formatConclusion(result: CompatibilityResult): String { open fun formatConclusion(result: CompatibilityResult): String {
@ -176,8 +179,8 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
} }
} }
val Reader.isSIM: Boolean private inline val Reader.isSIM: Boolean
get() = name.startsWith("SIM") get() = name.startsWith("SIM")
val Reader.slotIndex: Int private inline val Reader.slotIndex: Int
get() = (name.replace("SIM", "").toIntOrNull() ?: 1) get() = (name.replace("SIM", "").toIntOrNull() ?: 1) - 1 // 0-based index