Android.bp

@@ -1,7 +1,8 @@
 android_app {
     name: "OpenEUICC",
     static_libs: [
-        // Dependencies that must be pulled from maven,
+        // Dependencies that must be pulled from maven
+        "asn1bean-prebuilt-jar",
         "zxing-core-prebuilt-jar",
         "zxing-android-embedded-prebuilt-aar",
 
@@ -13,22 +14,18 @@ android_app {
         "androidx.lifecycle_lifecycle-runtime-ktx",
         "androidx.swiperefreshlayout_swiperefreshlayout",
         "com.google.android.material_material",
-        "gson",
+        "gson-prebuilt-jar",
         "kotlinx_coroutines",
     ],
-    jni_libs: [
-        "liblpac-jni",
-    ],
     srcs: [
         // Main app
         "app/src/main/**/*.kt",
 
-        // lpac-jni interface
-        "libs/lpac-jni/src/main/**/*.kt",
+        // TruPhone LPAd library
+        "libs/lpad-sm-dp-plus-connector/src/generated/**/*.java",
+        "libs/lpad-sm-dp-plus-connector/src/main/**/*.java",
+        "libs/lpad-sm-dp-plus-connector/src/main/**/*.kt",
     ],
-    optimize: {
-        enabled: false,
-    },
     resource_dirs: [
         "app/src/main/res",
     ],

app/src/main/AndroidManifest.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="ProtectedPermissions"
-    package="im.angry.openeuicc">
+    tools:ignore="ProtectedPermissions">
 
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />

app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt

@@ -29,24 +29,21 @@ class TelephonyManagerApduInterface(
         if (channel.status != IccOpenLogicalChannelResponse.STATUS_NO_ERROR || channel.channel == IccOpenLogicalChannelResponse.INVALID_CHANNEL) {
             throw IllegalArgumentException("Cannot open logical channel " + hex + " via TelephonManager on slot " + info.slotId);
         }
-        lastChannel = channel.channel
-        return lastChannel
+        return channel.channel
     }
 
     override fun logicalChannelClose(handle: Int) {
-        check(handle == lastChannel) { "Invalid channel handle " }
         tm.iccCloseLogicalChannelBySlot(info.slotId, handle)
-        lastChannel = -1
     }
 
     override fun transmit(tx: ByteArray): ByteArray {
         check(lastChannel != -1) { "Uninitialized" }
 
-        val cla = tx[0].toUByte().toInt()
-        val instruction = tx[1].toUByte().toInt()
-        val p1 = tx[2].toUByte().toInt()
-        val p2 = tx[3].toUByte().toInt()
-        val p3 = tx[4].toUByte().toInt()
+        val cla = tx[0].toInt()
+        val instruction = tx[1].toInt()
+        val p1 = tx[2].toInt()
+        val p2 = tx[3].toInt()
+        val p3 = tx[4].toInt()
         val p4 = tx.drop(5).toByteArray().encodeHex()
 
         return tm.iccTransmitApduLogicalChannelBySlot(info.slotId, lastChannel,

libs/lpac-jni/src/main/jni/Android.bp

@@ -1,52 +0,0 @@
-cc_defaults {
-    name: "lpac-jni-defaults",
-    local_include_dirs: ["lpac"],
-    sdk_version: "current",
-    cflags: ["-Wno-error"],
-}
-
-cc_library_static {
-    name: "liblpac-cjson",
-    defaults: ["lpac-jni-defaults"],
-    srcs: [
-        "lpac/cjson/*.c",
-    ],
-}
-
-cc_library_static {
-    name: "liblpac-asn1c",
-    defaults: ["lpac-jni-defaults"],
-    local_include_dirs: ["lpac/euicc/asn1c"],
-    cflags: ["-DHAVE_CONFIG_H"],
-    srcs: [
-        "lpac/euicc/asn1c/asn1/*.c",
-    ],
-}
-
-cc_library_static {
-    name: "liblpac-euicc",
-    defaults: ["lpac-jni-defaults"],
-    srcs: [
-        "lpac/euicc/*.c",
-    ],
-    static_libs: [
-        "liblpac-asn1c",
-        "liblpac-cjson",
-    ],
-}
-
-cc_library_shared {
-    name: "liblpac-jni",
-    defaults: ["lpac-jni-defaults"],
-    header_libs: ["jni_headers"],
-    srcs: [
-        "lpac-jni/*.c",
-    ],
-    static_libs: [
-        "liblpac-euicc",
-        "liblpac-asn1c",
-        "liblpac-cjson",
-    ],
-    shared_libs: ["liblog"],
-    system_ext_specific: true,
-}