PeterCxy/OpenEUICC
6
7
Fork 9
Code Issues 8 Pull requests Actions Projects Releases 5 Wiki Activity

lpac-jni: Validate reconnected APDU channel

Browse source
This commit is contained in:
Peter Cai 2024-01-01 20:40:12 -05:00
parent 451b17d0a5
commit f9e7d0ed8d
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libs/lpac-jni/src/main/java/net/typeblog/lpac_jni/impl/LocalProfileAssistantImpl.kt
View file

@ -33,6 +33,7 @@ class LocalProfileAssistantImpl(
try { try {
LpacJni.es10xFini(contextHandle) LpacJni.es10xFini(contextHandle)
LpacJni.destroyContext(contextHandle) LpacJni.destroyContext(contextHandle)
contextHandle = -1
} catch (e: Exception) { } catch (e: Exception) {
// Ignored // Ignored
} }
@ -47,12 +48,21 @@ class LocalProfileAssistantImpl(
try { try {
apduInterface.connect() apduInterface.connect()
contextHandle = LpacJni.createContext(apduInterface, httpInterface) contextHandle = LpacJni.createContext(apduInterface, httpInterface)
val res = LpacJni.es10xInit(contextHandle) check(LpacJni.es10xInit(contextHandle) >= 0) { "Reconnect attempt failed" }
Log.d(TAG, "$res") // Validate that we can actually use the APDU channel by trying to read eID
check(res >= 0) { "Reconnect attempt failed" } eID
break break
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
if (contextHandle != -1L) {
try {
LpacJni.es10xFini(contextHandle)
LpacJni.destroyContext(contextHandle)
contextHandle = -1
} catch (e: Exception) {
// Ignored
}
}
// continue retrying // continue retrying
delay(1000) delay(1000)
} }