app-common/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt

@@ -12,7 +12,15 @@ abstract class EuiccChannel(
 
     abstract val lpa: LocalProfileAssistant
     val valid: Boolean
-        get() = lpa.valid
+        get() {
+            try {
+                // Try to ping the eUICC card by reading the EID
+                lpa.eID
+            } catch (e: Exception) {
+                return false
+            }
+            return true
+        }
 
     fun close() = lpa.close()
 }

libs/lpac-jni/src/main/java/net/typeblog/lpac_jni/LocalProfileAssistant.kt

@@ -9,16 +9,6 @@ interface LocalProfileAssistant {
         private const val TAG = "LocalProfileAssistant"
     }
 
-    val valid: Boolean
-        get() = try {
-            // If we can read both eID and profiles properly, we are likely looking at
-            // a valid LocalProfileAssistant
-            eID
-            profiles
-            true
-        } catch (e: Exception) {
-            false
-        }
     val profiles: List<LocalProfileInfo>
     val notifications: List<LocalProfileNotification>
     val eID: String

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

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