Browse Source

ActivationCode -> LPAString

Un-confuse myself.... The term "ActivationCode" is too overloaded even
within OpenEUICC itself.
Peter Cai 11 months ago
parent
commit
2b86d719dd

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

@@ -124,7 +124,7 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
         // but that _is_ the desired behavior.
         // but that _is_ the desired behavior.
         val uri = intent.data
         val uri = intent.data
         if (uri?.scheme == "lpa") {
         if (uri?.scheme == "lpa") {
-            val parsed = ActivationCode.parse(uri.schemeSpecificPart)
+            val parsed = LPAString.parse(uri.schemeSpecificPart)
             state.smdp = parsed.address
             state.smdp = parsed.address
             state.matchingId = parsed.matchingId
             state.matchingId = parsed.matchingId
             state.confirmationCodeRequired = parsed.confirmationCodeRequired
             state.confirmationCodeRequired = parsed.confirmationCodeRequired
@@ -135,7 +135,7 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
     override fun onProvideAssistContent(outContent: AssistContent?) {
     override fun onProvideAssistContent(outContent: AssistContent?) {
         super.onProvideAssistContent(outContent)
         super.onProvideAssistContent(outContent)
         outContent?.webUri = try {
         outContent?.webUri = try {
-            val activationCode = ActivationCode(
+            val activationCode = LPAString(
                 state.smdp,
                 state.smdp,
                 state.matchingId,
                 state.matchingId,
                 null,
                 null,

+ 1 - 1
app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardMethodSelectFragment.kt

@@ -126,7 +126,7 @@ class DownloadWizardMethodSelectFragment : DownloadWizardActivity.DownloadWizard
 
 
     private fun processLpaString(input: String) {
     private fun processLpaString(input: String) {
         try {
         try {
-            val parsed = ActivationCode.parse(input)
+            val parsed = LPAString.parse(input)
             state.smdp = parsed.address
             state.smdp = parsed.address
             state.matchingId = parsed.matchingId
             state.matchingId = parsed.matchingId
             state.confirmationCodeRequired = parsed.confirmationCodeRequired
             state.confirmationCodeRequired = parsed.confirmationCodeRequired

+ 3 - 3
app-common/src/main/java/im/angry/openeuicc/util/ActivationCode.kt → app-common/src/main/java/im/angry/openeuicc/util/LPAString.kt

@@ -1,18 +1,18 @@
 package im.angry.openeuicc.util
 package im.angry.openeuicc.util
 
 
-data class ActivationCode(
+data class LPAString(
     val address: String,
     val address: String,
     val matchingId: String?,
     val matchingId: String?,
     val oid: String?,
     val oid: String?,
     val confirmationCodeRequired: Boolean,
     val confirmationCodeRequired: Boolean,
 ) {
 ) {
     companion object {
     companion object {
-        fun parse(input: String): ActivationCode {
+        fun parse(input: String): LPAString {
             val components = input.removePrefix("LPA:").split('$')
             val components = input.removePrefix("LPA:").split('$')
             if (components.size < 2 || components[0] != "1") {
             if (components.size < 2 || components[0] != "1") {
                 throw IllegalArgumentException("Invalid activation code format")
                 throw IllegalArgumentException("Invalid activation code format")
             }
             }
-            return ActivationCode(
+            return LPAString(
                 address = components[1].trim(),
                 address = components[1].trim(),
                 matchingId = components.getOrNull(2)?.trim()?.ifBlank { null },
                 matchingId = components.getOrNull(2)?.trim()?.ifBlank { null },
                 oid = components.getOrNull(3)?.trim()?.ifBlank { null },
                 oid = components.getOrNull(3)?.trim()?.ifBlank { null },