Merge pull request 'feat: profile sequence number' (#197) from septs/OpenEUICC:profile-sequence-number into master

Reviewed-on: PeterCxy/OpenEUICC#197

app-common/src/main/AndroidManifest.xml

@@ -46,6 +46,7 @@
                 <!-- for example: "LPA:1$..." -->
                 <!-- refs: https://www.iana.org/assignments/uri-schemes/prov/lpa -->
                 <data android:scheme="lpa" />
+                <data android:scheme="LPA" tools:ignore="AppLinkUrlError" />
                 <data android:sspPrefix="1$" />
             </intent-filter>
         </activity>

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

@@ -347,6 +347,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
         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)
+        private val profileSeqNumber: TextView = root.requireViewById(R.id.profile_sequence_number)
 
         init {
             iccid.setOnClickListener {
@@ -366,7 +367,9 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                 true
             }
 
-            profileMenu.setOnClickListener { showOptionsMenu() }
+            profileMenu.setOnClickListener {
+                showOptionsMenu()
+            }
         }
 
         private lateinit var profile: LocalProfileInfo
@@ -396,6 +399,13 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
             iccid.transformationMethod = PasswordTransformationMethod.getInstance()
         }
 
+        fun setProfileSequenceNumber(index: Int) {
+            profileSeqNumber.text = root.context.getString(
+                R.string.profile_sequence_number_format,
+                index,
+            )
+        }
+
         private fun showOptionsMenu() {
             // Prevent users from doing multiple things at once
             if (invalid || swipeRefresh.isRefreshing) return
@@ -461,6 +471,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
             when (holder) {
                 is ProfileViewHolder -> {
                     holder.setProfile(profiles[position])
+                    holder.setProfileSequenceNumber(position + 1)
                 }
                 is FooterViewHolder -> {
                     holder.attach(footerViews[position - profiles.size])

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

@@ -123,8 +123,8 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
         // If we get an LPA string from deep-link intents, extract from there.
         // Note that `onRestoreInstanceState` could override this with user input,
         // but that _is_ the desired behavior.
-        val uri = intent.data
-        if (uri?.scheme == "lpa") {
+        val uri = intent.data ?: return
+        if (uri.scheme.contentEquals("lpa", ignoreCase = true)) {
             val parsed = LPAString.parse(uri.schemeSpecificPart)
             state.smdp = parsed.address
             state.matchingId = parsed.matchingId

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

@@ -129,6 +129,14 @@
                 app:layout_constraintTop_toBottomOf="@id/profile_class"
                 app:layout_constraintBottom_toBottomOf="parent"/>
 
+            <TextView
+                android:id="@+id/profile_sequence_number"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="6dp"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="@id/iccid" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </com.google.android.material.card.MaterialCardView>

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

@@ -27,6 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
+        android:contentDescription="@string/profile_download"
         android:src="@drawable/ic_add"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>

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

@@ -19,6 +19,7 @@
     <string name="profile_class_provisioning">Provisioning</string>
     <string name="profile_class_operational">Operational</string>
     <string name="iccid" translatable="false">ICCID:</string>
+    <string name="profile_sequence_number_format" translatable="false">#%d</string>
 
     <string name="enable">Enable</string>
     <string name="disable">Disable</string>