Compare commits
1 commit
e9389c3483
...
63ee8be79b
Author | SHA1 | Date | |
---|---|---|---|
63ee8be79b |
2 changed files with 7 additions and 28 deletions
24
.idea/deploymentTargetSelector.xml
generated
24
.idea/deploymentTargetSelector.xml
generated
|
@ -8,30 +8,6 @@
|
|||
<SelectionState runConfigName="app">
|
||||
<option name="selectionMode" value="DROPDOWN" />
|
||||
</SelectionState>
|
||||
<SelectionState runConfigName="app-unpriv.androidTest">
|
||||
<option name="selectionMode" value="DROPDOWN" />
|
||||
</SelectionState>
|
||||
<SelectionState runConfigName="app-unpriv.main">
|
||||
<option name="selectionMode" value="DROPDOWN" />
|
||||
</SelectionState>
|
||||
<SelectionState runConfigName="app-unpriv.unitTest">
|
||||
<option name="selectionMode" value="DROPDOWN" />
|
||||
</SelectionState>
|
||||
<SelectionState runConfigName="app.unitTest">
|
||||
<option name="selectionMode" value="DROPDOWN" />
|
||||
</SelectionState>
|
||||
<SelectionState runConfigName="app.androidTest">
|
||||
<option name="selectionMode" value="DROPDOWN" />
|
||||
</SelectionState>
|
||||
<SelectionState runConfigName="app.main">
|
||||
<option name="selectionMode" value="DROPDOWN" />
|
||||
</SelectionState>
|
||||
<SelectionState runConfigName="workspace.OpenEUICC.app-unpriv">
|
||||
<option name="selectionMode" value="DROPDOWN" />
|
||||
</SelectionState>
|
||||
<SelectionState runConfigName="workspace.OpenEUICC.app">
|
||||
<option name="selectionMode" value="DROPDOWN" />
|
||||
</SelectionState>
|
||||
</selectionStates>
|
||||
</component>
|
||||
</project>
|
|
@ -127,8 +127,9 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
|
|||
if (!service.isConnected) {
|
||||
return CompatibilityResult(Compatibility.NOT_COMPATIBLE)
|
||||
}
|
||||
val omapiSlots = service.readers.filter { it.isSIM }.map { it.slotIndex }
|
||||
val slots = service.readers.filter { it.isSIM }.mapNotNull { reader ->
|
||||
val readers = service.readers.filter(Reader::isSIM)
|
||||
val omapiSlots = readers.mapNotNull(Reader::slotIndex)
|
||||
val slots = readers.mapNotNull { reader ->
|
||||
try {
|
||||
// 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
|
||||
|
@ -147,10 +148,12 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
|
|||
if (omapiSlots.isEmpty()) {
|
||||
return CompatibilityResult(Compatibility.NOT_COMPATIBLE)
|
||||
}
|
||||
val formatChannelName = appContainer.customizableTextProvider::formatInternalChannelName
|
||||
return CompatibilityResult(
|
||||
Compatibility.COMPATIBLE,
|
||||
slotsOmapi = omapiSlots.map { "SIM$it" },
|
||||
slotsIsdr = slots.map { "SIM$it" })
|
||||
slotsOmapi = omapiSlots.map(formatChannelName),
|
||||
slotsIsdr = slots.map(formatChannelName),
|
||||
)
|
||||
}
|
||||
|
||||
open fun formatConclusion(result: CompatibilityResult): String {
|
||||
|
|
Loading…
Add table
Reference in a new issue