chore: flatten install packages (#85)

Co-authored-by: Peter Cai <peter@typeblog.net>
Reviewed-on: PeterCxy/OpenEUICC#85
Co-authored-by: septs <github@septs.pw>
Co-committed-by: septs <github@septs.pw>

.forgejo/workflows/build-debug.yml

@@ -35,11 +35,12 @@ jobs:
       - name: Build Debug APKs
         run: ./gradlew --no-daemon assembleDebug
 
+      - name: Copy Artifacts
+        run: find . -name 'app*-debug.apk' -exec cp {} . \;
+
       - name: Upload Artifacts
         uses: https://gitea.angry.im/actions/upload-artifact@v3
         with:
           name: Debug APKs
           compression-level: 0
-          path: |
+          path: app*-debug.apk
-            app-unpriv/build/outputs/apk/debug/app-unpriv-debug.apk
-            app/build/outputs/apk/debug/app-debug.apk

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

@@ -52,6 +52,8 @@ class LocalProfileAssistantWrapper(orig: LocalProfileAssistant) :
 
     override fun handleNotification(seqNumber: Long): Boolean = lpa.handleNotification(seqNumber)
 
+    override fun euiccMemoryReset() = lpa.euiccMemoryReset()
+
     override fun setNickname(iccid: String, nickname: String): Boolean =
         lpa.setNickname(iccid, nickname)
 

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

@@ -38,8 +38,8 @@ class OmapiApduInterface(
         check(!this::lastChannel.isInitialized) {
             "Can only open one channel"
         }
-        lastChannel = session.openLogicalChannel(aid)!!;
+        lastChannel = session.openLogicalChannel(aid)!!
-        return 1;
+        return 1
     }
 
     override fun logicalChannelClose(handle: Int) {

app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt

@@ -20,6 +20,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
@@ -339,6 +340,8 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
         private val name: TextView = root.requireViewById(R.id.name)
         private val state: TextView = root.requireViewById(R.id.state)
         private val provider: TextView = root.requireViewById(R.id.provider)
+        private val profileClassLabel: TextView = root.requireViewById(R.id.profile_class_label)
+        private val profileClass: TextView = root.requireViewById(R.id.profile_class)
         private val profileMenu: ImageButton = root.requireViewById(R.id.profile_menu)
 
         init {
@@ -364,6 +367,10 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
         private lateinit var profile: LocalProfileInfo
 
         fun setProfile(profile: LocalProfileInfo) {
+            if (unfilteredProfileListFlow.value) {
+                profileClassLabel.isVisible = true
+                profileClass.isVisible = true
+            }
             this.profile = profile
             name.text = profile.displayName
 
@@ -375,6 +382,13 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                 }
             )
             provider.text = profile.providerName
+            if (profileClass.isVisible) profileClass.setText(
+                when (profile.profileClass) {
+                    LocalProfileInfo.Clazz.Testing -> R.string.profile_class_testing
+                    LocalProfileInfo.Clazz.Provisioning -> R.string.profile_class_provisioning
+                    LocalProfileInfo.Clazz.Operational -> R.string.profile_class_operational
+                }
+            )
             iccid.text = profile.iccid
             iccid.transformationMethod = PasswordTransformationMethod.getInstance()
         }

app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt

@@ -109,7 +109,7 @@ open class MainActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
     override fun onOptionsItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             R.id.settings -> {
-                startActivity(Intent(this, SettingsActivity::class.java));
+                startActivity(Intent(this, SettingsActivity::class.java))
                 true
             }
             R.id.reload -> {

app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt

@@ -117,11 +117,14 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
        launchTask {
            notificationAdapter.notifications =
                euiccChannelManager.withEuiccChannel(logicalSlotId) { channel ->
-                   val profiles = channel.lpa.profiles
+                   val nameMap = buildMap {
+                       for (profile in channel.lpa.profiles) {
+                           put(profile.iccid, profile.displayName)
+                       }
+                   }
 
                    channel.lpa.notifications.map {
-                       val profile = profiles.find { p -> p.iccid == it.iccid }
+                       LocalProfileNotificationWrapper(it, nameMap[it.iccid] ?: "???")
-                       LocalProfileNotificationWrapper(it, profile?.displayName ?: "???")
                    }
                }
        }
@@ -136,6 +139,8 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
     inner class NotificationViewHolder(private val root: View):
         RecyclerView.ViewHolder(root), View.OnCreateContextMenuListener, OnMenuItemClickListener {
         private val address: TextView = root.requireViewById(R.id.notification_address)
+        private val sequenceNumber: TextView =
+            root.requireViewById(R.id.notification_sequence_number)
         private val profileName: TextView = root.requireViewById(R.id.notification_profile_name)
 
         private lateinit var notification: LocalProfileNotificationWrapper
@@ -157,6 +162,7 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
             }
         }
 
+
         private fun operationToLocalizedText(operation: LocalProfileNotification.Operation) =
             root.context.getText(
                 when (operation) {
@@ -170,6 +176,10 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
             notification = value
 
             address.text = value.inner.notificationAddress
+            sequenceNumber.text = root.context.getString(
+                R.string.profile_notification_sequence_number_format,
+                value.inner.seqNumber
+            )
             profileName.text = Html.fromHtml(
                 root.context.getString(R.string.profile_notification_name_format,
                     operationToLocalizedText(value.inner.profileManagementOperation),

app-common/src/main/res/layout/euicc_profile.xml

@@ -62,18 +62,43 @@
                 android:singleLine="true"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/state"
-                app:layout_constraintBottom_toTopOf="@+id/iccid_label"/>
+                app:layout_constraintBottom_toTopOf="@+id/profile_class_label"/>
 
             <TextView
                 android:id="@+id/provider"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
-                android:layout_marginLeft="7dp"
+                android:layout_marginStart="7dp"
                 android:textSize="14sp"
                 android:singleLine="true"
                 app:layout_constraintLeft_toRightOf="@id/provider_label"
                 app:layout_constraintTop_toBottomOf="@id/state"
+                app:layout_constraintBottom_toTopOf="@+id/profile_class"/>
+
+            <TextView
+                android:id="@+id/profile_class_label"
+                android:text="@string/profile_class"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                android:singleLine="true"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/provider_label"
+                app:layout_constraintBottom_toTopOf="@+id/iccid_label"/>
+
+            <TextView
+                android:id="@+id/profile_class"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginStart="7dp"
+                android:textSize="14sp"
+                android:singleLine="true"
+                app:layout_constraintLeft_toRightOf="@id/profile_class_label"
+                app:layout_constraintTop_toBottomOf="@id/provider"
                 app:layout_constraintBottom_toTopOf="@+id/iccid"/>
 
             <TextView
@@ -86,7 +111,7 @@
                 android:textStyle="bold"
                 android:singleLine="true"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/provider_label"
+                app:layout_constraintTop_toBottomOf="@id/profile_class_label"
                 app:layout_constraintBottom_toBottomOf="parent"/>
 
             <TextView
@@ -94,11 +119,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
-                android:layout_marginLeft="7dp"
+                android:layout_marginStart="7dp"
                 android:textSize="14sp"
                 android:singleLine="true"
                 app:layout_constraintLeft_toRightOf="@id/iccid_label"
-                app:layout_constraintTop_toBottomOf="@id/provider"
+                app:layout_constraintTop_toBottomOf="@id/profile_class"
                 app:layout_constraintBottom_toBottomOf="parent"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>

app-common/src/main/res/layout/notification_item.xml

@@ -15,6 +15,15 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/notification_sequence_number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginVertical="12dp"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/notification_profile_name"
         android:layout_width="0dp"

app-common/src/main/res/values-ja/strings.xml

@@ -11,7 +11,6 @@
     <string name="enabled">有効済み</string>
     <string name="disabled">無効済み</string>
     <string name="provider">プロバイダー:</string>
-    <string name="iccid">ICCID:</string>
     <string name="enable">有効化</string>
     <string name="disable">無効化</string>
     <string name="delete">削除</string>
@@ -89,7 +88,6 @@
     <string name="profile_notification_operation_delete">削除しました</string>
     <string name="profile_notification_operation_enable">有効化しました</string>
     <string name="profile_notification_operation_disable">無効化しました</string>
-    <string name="profile_notification_name_format">&lt;b&gt;%1$s&lt;/b&gt; %2$s (%3$s)</string>
     <string name="profile_notification_process">処理</string>
     <string name="profile_notification_delete">削除</string>
     <string name="euicc_info">eUICC 情報</string>

app-common/src/main/res/values/strings.xml

@@ -13,7 +13,11 @@
     <string name="enabled">Enabled</string>
     <string name="disabled">Disabled</string>
     <string name="provider">Provider:</string>
-    <string name="iccid">ICCID:</string>
+    <string name="profile_class">Class:</string>
+    <string name="profile_class_testing">Testing</string>
+    <string name="profile_class_provisioning">Provisioning</string>
+    <string name="profile_class_operational">Operational</string>
+    <string name="iccid" translatable="false">ICCID:</string>
 
     <string name="enable">Enable</string>
     <string name="disable">Disable</string>
@@ -103,7 +107,8 @@
     <string name="profile_notification_operation_delete">Deleted</string>
     <string name="profile_notification_operation_enable">Enabled</string>
     <string name="profile_notification_operation_disable">Disabled</string>
-    <string name="profile_notification_name_format">&lt;b&gt;%1$s&lt;/b&gt; %2$s (%3$s)</string>
+    <string name="profile_notification_name_format" translatable="false">&lt;b&gt;%1$s&lt;/b&gt; %2$s (%3$s)</string>
+    <string name="profile_notification_sequence_number_format" translatable="false">#%d</string>
     <string name="profile_notification_process">Process</string>
     <string name="profile_notification_delete">Delete</string>
 

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

@@ -39,7 +39,7 @@ class TelephonyManagerApduInterface(
         val hex = aid.encodeHex()
         val channel = tm.iccOpenLogicalChannelByPortCompat(port.card.physicalSlotIndex, port.portIndex, hex, 0)
         if (channel.status != IccOpenLogicalChannelResponse.STATUS_NO_ERROR || channel.channel == IccOpenLogicalChannelResponse.INVALID_CHANNEL) {
-            throw IllegalArgumentException("Cannot open logical channel $hex via TelephonManager on slot ${port.card.physicalSlotIndex} port ${port.portIndex}");
+            throw IllegalArgumentException("Cannot open logical channel $hex via TelephonManager on slot ${port.card.physicalSlotIndex} port ${port.portIndex}")
         }
         lastChannel = channel.channel
         return lastChannel

app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyCompat.kt

@@ -94,6 +94,7 @@ val TelephonyManager.uiccCardsInfoCompat: List<RealUiccCardInfoCompat>
 fun TelephonyManager.iccOpenLogicalChannelByPortCompat(
     slotIndex: Int, portIndex: Int, aid: String?, p2: Int
 ): IccOpenLogicalChannelResponse =
+    @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
         iccOpenLogicalChannelByPort(slotIndex, portIndex, aid, p2)!!
     } else {

libs/lpac-jni/build.gradle.kts

@@ -16,9 +16,9 @@ android {
         externalNativeBuild {
             ndkBuild {
                 cFlags(
-                    "-fmacro-prefix-map=${project.projectDir.toString()}=/fake/path/",
+                    "-fmacro-prefix-map=${project.projectDir}=/fake/path/",
-                    "-fdebug-prefix-map=${project.projectDir.toString()}=/fake/path/",
+                    "-fdebug-prefix-map=${project.projectDir}=/fake/path/",
-                    "-ffile-prefix-map=${project.projectDir.toString()}=/fake/path/"
+                    "-ffile-prefix-map=${project.projectDir}=/fake/path/"
                 )
             }
         }

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

@@ -37,6 +37,8 @@ interface LocalProfileAssistant {
     fun deleteNotification(seqNumber: Long): Boolean
     fun handleNotification(seqNumber: Long): Boolean
 
+    fun euiccMemoryReset()
+
     fun setNickname(
         iccid: String, nickname: String
     ): Boolean

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

@@ -33,6 +33,8 @@ internal object LpacJni {
     // Cancel any ongoing es9p and/or es10b sessions
     external fun cancelSessions(handle: Long)
 
+    // ES10c
+    external fun es10cEuiccMemoryReset(handle: Long): Int
     // es10cex (actually part of es10b)
     external fun es10cexGetEuiccInfo2(handle: Long): Long
 

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

@@ -241,6 +241,10 @@ class LocalProfileAssistantImpl(
     override fun setNickname(iccid: String, nickname: String): Boolean =
         LpacJni.es10cSetNickname(contextHandle, iccid, nickname) == 0
 
+    override fun euiccMemoryReset() {
+        LpacJni.es10cEuiccMemoryReset(contextHandle)
+    }
+
     @Synchronized
     override fun close() {
         if (!finalized) {

libs/lpac-jni/src/main/jni/lpac-jni/lpac-jni.c

@@ -245,6 +245,15 @@ Java_net_typeblog_lpac_1jni_LpacJni_es10cexGetEuiccInfo2(JNIEnv *env, jobject th
     return (jlong) info;
 }
 
+
+JNIEXPORT jint JNICALL
+Java_net_typeblog_lpac_1jni_LpacJni_es10cEuiccMemoryReset(JNIEnv *env, jobject thiz, jlong handle) {
+    struct euicc_ctx *ctx = (struct euicc_ctx *) handle;
+    int ret;
+    ret = es10c_euicc_memory_reset(ctx);
+    return ret;
+}
+
 JNIEXPORT jstring JNICALL
 Java_net_typeblog_lpac_1jni_LpacJni_stringDeref(JNIEnv *env, jobject thiz, jlong curr) {
     return toJString(env, *((char **) curr));