chore: improve marker

app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickAvailabilityCheckActivity.kt

@@ -15,6 +15,7 @@ import im.angry.easyeuicc.R
 import im.angry.openeuicc.di.UnprivilegedCustomizableTextProvider
 import im.angry.openeuicc.util.EUICC_DEFAULT_ISDR_AID
 import im.angry.openeuicc.util.OpenEuiccContextMarker
+import im.angry.openeuicc.util.UnprivilegedEuiccContextMarker
 import im.angry.openeuicc.util.connectSEService
 import im.angry.openeuicc.util.decodeHex
 import im.angry.openeuicc.util.isSIM
@@ -23,7 +24,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 
 
-class QuickAvailabilityCheckActivity : AppCompatActivity(), OpenEuiccContextMarker {
+class QuickAvailabilityCheckActivity : AppCompatActivity(), UnprivilegedEuiccContextMarker {
     companion object {
         const val EXTRA_FROM = "from_quick_availability"
 
@@ -79,9 +80,8 @@ class QuickAvailabilityCheckActivity : AppCompatActivity(), OpenEuiccContextMark
 
     suspend fun onCompatibilityUpdate() {
         val result = getCompatibilityCheckResult()
-        conclusion.text =
+        conclusion.text = appContainer.customizableTextProvider
-            (appContainer.customizableTextProvider as UnprivilegedCustomizableTextProvider)
+            .formatQuickAvailabilityConclusion(result.compatibility === Compatibility.COMPATIBLE)
-                .formatQuickAvailabilityConclusion(result.compatibility === Compatibility.COMPATIBLE)
         if (result.compatibility != Compatibility.COMPATIBLE) return
         resultSlots.isVisible = true
         resultSlots.text = getString(

app-unpriv/src/main/java/im/angry/openeuicc/util/UnprivilegedUtils.kt

@@ -0,0 +1,14 @@
+package im.angry.openeuicc.util
+
+import im.angry.openeuicc.di.AppContainer
+import im.angry.openeuicc.di.UnprivilegedCustomizableTextProvider
+
+interface UnprivilegedEuiccContextMarker : OpenEuiccContextMarker {
+    override val appContainer: UnprivilegedAppContainer
+        get() = super.appContainer as UnprivilegedAppContainer
+}
+
+interface UnprivilegedAppContainer : AppContainer {
+    override val customizableTextProvider: UnprivilegedCustomizableTextProvider
+        get() = super.customizableTextProvider as UnprivilegedCustomizableTextProvider
+}