diff --git a/app-common/src/main/AndroidManifest.xml b/app-common/src/main/AndroidManifest.xml
index f53e6ff..6edaaf1 100644
--- a/app-common/src/main/AndroidManifest.xml
+++ b/app-common/src/main/AndroidManifest.xml
@@ -30,7 +30,20 @@
+ android:label="@string/download_wizard">
+
+
+
+
+
+
+
+
+
+
+
+
+
- if (!channel.lpa.switchProfile(iccid, enable, refresh = true)) {
- // Sometimes, we *can* enable or disable the profile, but we cannot
- // send the refresh command to the modem because the profile somehow
- // makes the modem "busy". In this case, we can still switch by setting
- // refresh to false, but then the switch cannot take effect until the
- // user resets the modem manually by toggling airplane mode or rebooting.
- Pair(channel.lpa.switchProfile(iccid, enable, refresh = false), false)
- } else {
- Pair(true, true)
- }
- }
+ suspend fun onSwitch(channel: EuiccChannel): Pair {
+ val refresh = preferenceRepository.refreshAfterSwitchFlow.first()
+ val response = channel.lpa.switchProfile(iccid, enable, refresh)
+ if (response || !refresh) return Pair(response, refresh)
+ // refresh failed, but refresh was requested
+ // Sometimes, we *can* enable or disable the profile, but we cannot
+ // send the refresh command to the modem because the profile somehow
+ // makes the modem "busy". In this case, we can still switch by setting
+ // refresh to false, but then the switch cannot take effect until the
+ // user resets the modem manually by toggling airplane mode or rebooting.
+ return Pair(channel.lpa.switchProfile(iccid, enable, refresh = false), false)
+ }
- if (!res) {
+ euiccChannelManager.beginTrackedOperation(slotId, portId) {
+ val (response, refreshed) =
+ euiccChannelManager.withEuiccChannel(slotId, portId, ::onSwitch)
+
+ if (!response) {
throw RuntimeException("Could not switch profile")
}
@@ -495,4 +496,15 @@ class EuiccChannelManagerService : LifecycleService(), OpenEuiccContextMarker {
preferenceRepository.notificationSwitchFlow.first()
}
}
+
+ fun launchMemoryReset(slotId: Int, portId: Int): ForegroundTaskSubscriberFlow =
+ launchForegroundTask(
+ getString(R.string.task_euicc_memory_reset),
+ getString(R.string.task_euicc_memory_reset_failure),
+ R.drawable.ic_euicc_memory_reset
+ ) {
+ euiccChannelManager.withEuiccChannel(slotId, portId) { channel ->
+ channel.lpa.euiccMemoryReset()
+ }
+ }
}
\ No newline at end of file
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
index 842f4ec..12995ff 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
@@ -38,8 +38,10 @@ import im.angry.openeuicc.util.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.TimeoutCancellationException
import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
@@ -55,6 +57,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
private lateinit var fab: FloatingActionButton
private lateinit var profileList: RecyclerView
private var logicalSlotId: Int = -1
+ private lateinit var eid: String
private val adapter = EuiccProfileAdapter()
@@ -131,31 +134,42 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
inflater.inflate(R.menu.fragment_euicc, menu)
}
- override fun onOptionsItemSelected(item: MenuItem): Boolean =
- when (item.itemId) {
- R.id.show_notifications -> {
- if (logicalSlotId != -1) {
- Intent(requireContext(), NotificationsActivity::class.java).apply {
- putExtra("logicalSlotId", logicalSlotId)
- startActivity(this)
- }
- }
- true
- }
+ override fun onPrepareOptionsMenu(menu: Menu) {
+ super.onPrepareOptionsMenu(menu)
+ menu.findItem(R.id.show_notifications).isVisible =
+ logicalSlotId != -1
+ menu.findItem(R.id.euicc_info).isVisible =
+ logicalSlotId != -1
+ menu.findItem(R.id.euicc_memory_reset).isVisible =
+ runBlocking { preferenceRepository.euiccMemoryResetFlow.first() }
+ }
- R.id.euicc_info -> {
- if (logicalSlotId != -1) {
- Intent(requireContext(), EuiccInfoActivity::class.java).apply {
- putExtra("logicalSlotId", logicalSlotId)
- startActivity(this)
- }
- }
- true
+ override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+ R.id.show_notifications -> {
+ Intent(requireContext(), NotificationsActivity::class.java).apply {
+ putExtra("logicalSlotId", logicalSlotId)
+ startActivity(this)
}
-
- else -> super.onOptionsItemSelected(item)
+ true
}
+ R.id.euicc_info -> {
+ Intent(requireContext(), EuiccInfoActivity::class.java).apply {
+ putExtra("logicalSlotId", logicalSlotId)
+ startActivity(this)
+ }
+ true
+ }
+
+ R.id.euicc_memory_reset -> {
+ EuiccMemoryResetFragment.newInstance(slotId, portId, eid)
+ .show(childFragmentManager, EuiccMemoryResetFragment.TAG)
+ true
+ }
+
+ else -> super.onOptionsItemSelected(item)
+ }
+
protected open suspend fun onCreateFooterViews(
parent: ViewGroup,
profiles: List
@@ -192,6 +206,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
val profiles = withEuiccChannel { channel ->
logicalSlotId = channel.logicalSlotId
+ eid = channel.lpa.eID
euiccChannelManager.notifyEuiccProfilesChanged(channel.logicalSlotId)
if (unfilteredProfileListFlow.value)
channel.lpa.profiles
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccMemoryResetFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccMemoryResetFragment.kt
new file mode 100644
index 0000000..086a849
--- /dev/null
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccMemoryResetFragment.kt
@@ -0,0 +1,126 @@
+package im.angry.openeuicc.ui
+
+import android.graphics.Typeface
+import android.os.Bundle
+import android.text.Editable
+import android.util.Log
+import android.widget.EditText
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import im.angry.openeuicc.common.R
+import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
+import im.angry.openeuicc.util.EuiccChannelFragmentMarker
+import im.angry.openeuicc.util.EuiccProfilesChangedListener
+import im.angry.openeuicc.util.ensureEuiccChannelManager
+import im.angry.openeuicc.util.euiccChannelManagerService
+import im.angry.openeuicc.util.newInstanceEuicc
+import im.angry.openeuicc.util.notifyEuiccProfilesChanged
+import im.angry.openeuicc.util.portId
+import im.angry.openeuicc.util.slotId
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.launch
+
+class EuiccMemoryResetFragment : DialogFragment(), EuiccChannelFragmentMarker {
+ companion object {
+ const val TAG = "EuiccMemoryResetFragment"
+
+ private const val FIELD_EID = "eid"
+
+ fun newInstance(slotId: Int, portId: Int, eid: String) =
+ newInstanceEuicc(EuiccMemoryResetFragment::class.java, slotId, portId) {
+ putString(FIELD_EID, eid)
+ }
+ }
+
+ private val eid: String by lazy { requireArguments().getString(FIELD_EID)!! }
+
+ private val confirmText: String by lazy {
+ getString(R.string.euicc_memory_reset_confirm_text, eid.takeLast(8))
+ }
+
+ private inline val isMatched: Boolean
+ get() = editText.text.toString() == confirmText
+
+ private var confirmed = false
+
+ private var toast: Toast? = null
+ set(value) {
+ toast?.cancel()
+ field = value
+ value?.show()
+ }
+
+ private val editText by lazy {
+ EditText(requireContext()).apply {
+ isLongClickable = false
+ typeface = Typeface.MONOSPACE
+ hint = Editable.Factory.getInstance()
+ .newEditable(getString(R.string.euicc_memory_reset_hint_text, confirmText))
+ }
+ }
+
+ private inline val alertDialog: AlertDialog
+ get() = requireDialog() as AlertDialog
+
+ override fun onCreateDialog(savedInstanceState: Bundle?) =
+ AlertDialog.Builder(requireContext(), R.style.AlertDialogTheme)
+ .setTitle(R.string.euicc_memory_reset_title)
+ .setMessage(getString(R.string.euicc_memory_reset_message, eid, confirmText))
+ .setView(editText)
+ // Set listener to null to prevent auto closing
+ .setNegativeButton(android.R.string.cancel, null)
+ .setPositiveButton(R.string.euicc_memory_reset_invoke_button, null)
+ .create()
+
+ override fun onResume() {
+ super.onResume()
+ alertDialog.setCanceledOnTouchOutside(false)
+ alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
+ .setOnClickListener { if (!confirmed) confirmation() }
+ alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE)
+ .setOnClickListener { if (!confirmed) dismiss() }
+ }
+
+ private fun confirmation() {
+ toast?.cancel()
+ if (!isMatched) {
+ Log.d(TAG, buildString {
+ appendLine("User input is mismatch:")
+ appendLine(editText.text)
+ appendLine(confirmText)
+ })
+ val resId = R.string.toast_euicc_memory_reset_confirm_text_mismatched
+ toast = Toast.makeText(requireContext(), resId, Toast.LENGTH_LONG)
+ return
+ }
+ confirmed = true
+ preventUserAction()
+
+ requireParentFragment().lifecycleScope.launch {
+ ensureEuiccChannelManager()
+ euiccChannelManagerService.waitForForegroundTask()
+
+ euiccChannelManagerService.launchMemoryReset(slotId, portId)
+ .onStart {
+ parentFragment?.notifyEuiccProfilesChanged()
+
+ val resId = R.string.toast_euicc_memory_reset_finitshed
+ toast = Toast.makeText(requireContext(), resId, Toast.LENGTH_LONG)
+
+ runCatching(::dismiss)
+ }
+ .waitDone()
+ }
+ }
+
+ private fun preventUserAction() {
+ editText.isEnabled = false
+ alertDialog.setCancelable(false)
+ alertDialog.setCanceledOnTouchOutside(false)
+ alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
+ alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).isEnabled = false
+ }
+}
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt
index fab680f..d137e90 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt
@@ -77,6 +77,12 @@ open class SettingsFragment: PreferenceFragmentCompat() {
requirePreference("pref_developer_ignore_tls_certificate")
.bindBooleanFlow(preferenceRepository.ignoreTLSCertificateFlow)
+
+ requirePreference("pref_developer_refresh_after_switch")
+ .bindBooleanFlow(preferenceRepository.refreshAfterSwitchFlow)
+
+ requirePreference("pref_developer_euicc_memory_reset")
+ .bindBooleanFlow(preferenceRepository.euiccMemoryResetFlow)
}
protected fun requirePreference(key: CharSequence) =
@@ -122,7 +128,7 @@ open class SettingsFragment: PreferenceFragmentCompat() {
return true
}
- private fun CheckBoxPreference.bindBooleanFlow(flow: PreferenceFlowWrapper) {
+ protected fun CheckBoxPreference.bindBooleanFlow(flow: PreferenceFlowWrapper) {
lifecycleScope.launch {
flow.collect { isChecked = it }
}
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardActivity.kt b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardActivity.kt
index 8cab18b..a9f868f 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardActivity.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardActivity.kt
@@ -21,7 +21,6 @@ import im.angry.openeuicc.ui.BaseEuiccAccessActivity
import im.angry.openeuicc.util.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
import net.typeblog.lpac_jni.LocalProfileAssistant
class DownloadWizardActivity: BaseEuiccAccessActivity() {
@@ -35,6 +34,8 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
var downloadStarted: Boolean,
var downloadTaskID: Long,
var downloadError: LocalProfileAssistant.ProfileDownloadException?,
+ var skipMethodSelect: Boolean,
+ var confirmationCodeRequired: Boolean,
)
private lateinit var state: DownloadWizardState
@@ -63,17 +64,21 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
})
state = DownloadWizardState(
- null,
- intent.getIntExtra("selectedLogicalSlot", 0),
- "",
- null,
- null,
- null,
- false,
- -1,
- null
+ currentStepFragmentClassName = null,
+ selectedLogicalSlot = intent.getIntExtra("selectedLogicalSlot", 0),
+ smdp = "",
+ matchingId = null,
+ confirmationCode = null,
+ imei = null,
+ downloadStarted = false,
+ downloadTaskID = -1,
+ downloadError = null,
+ skipMethodSelect = false,
+ confirmationCodeRequired = false,
)
+ handleDeepLink()
+
progressBar = requireViewById(R.id.progress)
nextButton = requireViewById(R.id.download_wizard_next)
prevButton = requireViewById(R.id.download_wizard_back)
@@ -113,10 +118,24 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
}
}
+ private fun handleDeepLink() {
+ // 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 parsed = LPAString.parse(uri.schemeSpecificPart)
+ state.smdp = parsed.address
+ state.matchingId = parsed.matchingId
+ state.confirmationCodeRequired = parsed.confirmationCodeRequired
+ state.skipMethodSelect = true
+ }
+ }
+
override fun onProvideAssistContent(outContent: AssistContent?) {
super.onProvideAssistContent(outContent)
outContent?.webUri = try {
- val activationCode = ActivationCode(
+ val activationCode = LPAString(
state.smdp,
state.matchingId,
null,
@@ -138,6 +157,7 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
outState.putString("imei", state.imei)
outState.putBoolean("downloadStarted", state.downloadStarted)
outState.putLong("downloadTaskID", state.downloadTaskID)
+ outState.putBoolean("confirmationCodeRequired", state.confirmationCodeRequired)
}
override fun onRestoreInstanceState(savedInstanceState: Bundle) {
@@ -154,6 +174,8 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
state.downloadStarted =
savedInstanceState.getBoolean("downloadStarted", state.downloadStarted)
state.downloadTaskID = savedInstanceState.getLong("downloadTaskID", state.downloadTaskID)
+ state.confirmationCode = savedInstanceState.getString("confirmationCode", state.confirmationCode)
+ state.confirmationCodeRequired = savedInstanceState.getBoolean("confirmationCodeRequired", state.confirmationCodeRequired)
}
private fun onPrevPressed() {
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardDetailsFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardDetailsFragment.kt
index 5fa8002..402e7a5 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardDetailsFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardDetailsFragment.kt
@@ -5,6 +5,7 @@ import android.util.Patterns
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.Toast
import androidx.core.widget.addTextChangedListener
import com.google.android.material.textfield.TextInputLayout
import im.angry.openeuicc.common.R
@@ -36,7 +37,11 @@ class DownloadWizardDetailsFragment : DownloadWizardActivity.DownloadWizardStepF
DownloadWizardProgressFragment()
override fun createPrevFragment(): DownloadWizardActivity.DownloadWizardStepFragment =
- DownloadWizardMethodSelectFragment()
+ if (state.skipMethodSelect) {
+ DownloadWizardSlotSelectFragment()
+ } else {
+ DownloadWizardMethodSelectFragment()
+ }
override fun onCreateView(
inflater: LayoutInflater,
@@ -51,6 +56,9 @@ class DownloadWizardDetailsFragment : DownloadWizardActivity.DownloadWizardStepF
smdp.editText!!.addTextChangedListener {
updateInputCompleteness()
}
+ confirmationCode.editText!!.addTextChangedListener {
+ updateInputCompleteness()
+ }
return view
}
@@ -61,6 +69,15 @@ class DownloadWizardDetailsFragment : DownloadWizardActivity.DownloadWizardStepF
confirmationCode.editText!!.setText(state.confirmationCode)
imei.editText!!.setText(state.imei)
updateInputCompleteness()
+
+ if (state.confirmationCodeRequired) {
+ confirmationCode.editText!!.requestFocus()
+ confirmationCode.editText!!.hint =
+ getString(R.string.profile_download_confirmation_code_required)
+ } else {
+ confirmationCode.editText!!.hint =
+ getString(R.string.profile_download_confirmation_code)
+ }
}
override fun onPause() {
@@ -70,6 +87,9 @@ class DownloadWizardDetailsFragment : DownloadWizardActivity.DownloadWizardStepF
private fun updateInputCompleteness() {
inputComplete = Patterns.DOMAIN_NAME.matcher(smdp.editText!!.text).matches()
+ if (state.confirmationCodeRequired) {
+ inputComplete = inputComplete && confirmationCode.editText!!.text.isNotEmpty()
+ }
refreshButtons()
}
}
\ No newline at end of file
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardMethodSelectFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardMethodSelectFragment.kt
index 2846fd7..4b02b7a 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardMethodSelectFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardMethodSelectFragment.kt
@@ -42,21 +42,16 @@ class DownloadWizardMethodSelectFragment : DownloadWizardActivity.DownloadWizard
registerForActivityResult(ActivityResultContracts.GetContent()) { result ->
if (result == null) return@registerForActivityResult
- lifecycleScope.launch(Dispatchers.IO) {
- runCatching {
- requireContext().contentResolver.openInputStream(result)?.let { input ->
- val bmp = BitmapFactory.decodeStream(input)
- input.close()
-
- decodeQrFromBitmap(bmp)?.let {
- withContext(Dispatchers.Main) {
- processLpaString(it)
- }
+ lifecycleScope.launch {
+ val decoded = withContext(Dispatchers.IO) {
+ runCatching {
+ requireContext().contentResolver.openInputStream(result)?.use { input ->
+ BitmapFactory.decodeStream(input).use(::decodeQrFromBitmap)
}
-
- bmp.recycle()
}
}
+
+ decoded.getOrNull()?.let { processLpaString(it) }
}
}
@@ -126,18 +121,10 @@ class DownloadWizardMethodSelectFragment : DownloadWizardActivity.DownloadWizard
private fun processLpaString(input: String) {
try {
- val parsed = ActivationCode.fromString(input)
+ val parsed = LPAString.parse(input)
state.smdp = parsed.address
state.matchingId = parsed.matchingId
- if (parsed.confirmationCodeRequired) {
- AlertDialog.Builder(requireContext()).apply {
- setTitle(R.string.profile_download_required_confirmation_code)
- setMessage(R.string.profile_download_required_confirmation_code_message)
- setCancelable(true)
- setPositiveButton(android.R.string.ok, null)
- show()
- }
- }
+ state.confirmationCodeRequired = parsed.confirmationCodeRequired
gotoNextFragment(DownloadWizardDetailsFragment())
} catch (e: IllegalArgumentException) {
AlertDialog.Builder(requireContext()).apply {
@@ -150,14 +137,19 @@ class DownloadWizardMethodSelectFragment : DownloadWizardActivity.DownloadWizard
}
}
- private class DownloadMethodViewHolder(private val root: View) : ViewHolder(root) {
+ private inner class DownloadMethodViewHolder(private val root: View) : ViewHolder(root) {
private val icon = root.requireViewById(R.id.download_method_icon)
private val title = root.requireViewById(R.id.download_method_title)
fun bind(item: DownloadMethod) {
icon.setImageResource(item.iconRes)
title.setText(item.titleRes)
- root.setOnClickListener { item.onClick() }
+ root.setOnClickListener {
+ // If the user elected to use another download method, reset the confirmation code flag
+ // too
+ state.confirmationCodeRequired = false
+ item.onClick()
+ }
}
}
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardSlotSelectFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardSlotSelectFragment.kt
index 5510fb0..28bc9f0 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardSlotSelectFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardSlotSelectFragment.kt
@@ -49,7 +49,11 @@ class DownloadWizardSlotSelectFragment : DownloadWizardActivity.DownloadWizardSt
get() = true
override fun createNextFragment(): DownloadWizardActivity.DownloadWizardStepFragment =
- DownloadWizardMethodSelectFragment()
+ if (state.skipMethodSelect) {
+ DownloadWizardDetailsFragment()
+ } else {
+ DownloadWizardMethodSelectFragment()
+ }
override fun createPrevFragment(): DownloadWizardActivity.DownloadWizardStepFragment? = null
diff --git a/app-common/src/main/java/im/angry/openeuicc/util/ActivationCode.kt b/app-common/src/main/java/im/angry/openeuicc/util/LPAString.kt
similarity index 79%
rename from app-common/src/main/java/im/angry/openeuicc/util/ActivationCode.kt
rename to app-common/src/main/java/im/angry/openeuicc/util/LPAString.kt
index c21e837..20956fb 100644
--- a/app-common/src/main/java/im/angry/openeuicc/util/ActivationCode.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/util/LPAString.kt
@@ -1,18 +1,18 @@
package im.angry.openeuicc.util
-data class ActivationCode(
+data class LPAString(
val address: String,
- val matchingId: String? = null,
- val oid: String? = null,
- val confirmationCodeRequired: Boolean = false,
+ val matchingId: String?,
+ val oid: String?,
+ val confirmationCodeRequired: Boolean,
) {
companion object {
- fun fromString(input: String): ActivationCode {
+ fun parse(input: String): LPAString {
val components = input.removePrefix("LPA:").split('$')
if (components.size < 2 || components[0] != "1") {
throw IllegalArgumentException("Invalid activation code format")
}
- return ActivationCode(
+ return LPAString(
address = components[1].trim(),
matchingId = components.getOrNull(2)?.trim()?.ifBlank { null },
oid = components.getOrNull(3)?.trim()?.ifBlank { null },
diff --git a/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
index f5e3ca2..6ea342c 100644
--- a/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt
@@ -26,6 +26,7 @@ internal object PreferenceKeys {
val NOTIFICATION_SWITCH = booleanPreferencesKey("notification_switch")
// ---- Advanced ----
+ val REFRESH_AFTER_SWITCH = booleanPreferencesKey("refresh_after_switch")
val DISABLE_SAFEGUARD_REMOVABLE_ESIM = booleanPreferencesKey("disable_safeguard_removable_esim")
val VERBOSE_LOGGING = booleanPreferencesKey("verbose_logging")
@@ -33,9 +34,10 @@ internal object PreferenceKeys {
val DEVELOPER_OPTIONS_ENABLED = booleanPreferencesKey("developer_options_enabled")
val UNFILTERED_PROFILE_LIST = booleanPreferencesKey("unfiltered_profile_list")
val IGNORE_TLS_CERTIFICATE = booleanPreferencesKey("ignore_tls_certificate")
+ val EUICC_MEMORY_RESET = booleanPreferencesKey("euicc_memory_reset")
}
-class PreferenceRepository(private val context: Context) {
+open class PreferenceRepository(private val context: Context) {
// Expose flows so that we can also handle default values
// ---- Profile Notifications ----
val notificationDownloadFlow = bindFlow(PreferenceKeys.NOTIFICATION_DOWNLOAD, true)
@@ -47,26 +49,25 @@ class PreferenceRepository(private val context: Context) {
val verboseLoggingFlow = bindFlow(PreferenceKeys.VERBOSE_LOGGING, false)
// ---- Developer Options ----
+ val refreshAfterSwitchFlow = bindFlow(PreferenceKeys.REFRESH_AFTER_SWITCH, true)
val developerOptionsEnabledFlow = bindFlow(PreferenceKeys.DEVELOPER_OPTIONS_ENABLED, false)
val unfilteredProfileListFlow = bindFlow(PreferenceKeys.UNFILTERED_PROFILE_LIST, false)
val ignoreTLSCertificateFlow = bindFlow(PreferenceKeys.IGNORE_TLS_CERTIFICATE, false)
+ val euiccMemoryResetFlow = bindFlow(PreferenceKeys.EUICC_MEMORY_RESET, false)
- private fun bindFlow(key: Preferences.Key, defaultValue: T): PreferenceFlowWrapper =
+ protected fun bindFlow(key: Preferences.Key, defaultValue: T): PreferenceFlowWrapper =
PreferenceFlowWrapper(context, key, defaultValue)
}
class PreferenceFlowWrapper private constructor(
private val context: Context,
private val key: Preferences.Key,
- inner: Flow
+ inner: Flow,
) : Flow by inner {
- internal constructor(context: Context, key: Preferences.Key, defaultValue: T) : this(
- context,
- key,
- context.dataStore.data.map { it[key] ?: defaultValue }
- )
+ internal constructor(context: Context, key: Preferences.Key, defaultValue: T) :
+ this(context, key, context.dataStore.data.map { it[key] ?: defaultValue })
suspend fun updatePreference(value: T) {
context.dataStore.edit { it[key] = value }
}
-}
\ No newline at end of file
+}
diff --git a/app-common/src/main/java/im/angry/openeuicc/util/Utils.kt b/app-common/src/main/java/im/angry/openeuicc/util/Utils.kt
index 444c176..5a559f9 100644
--- a/app-common/src/main/java/im/angry/openeuicc/util/Utils.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/util/Utils.kt
@@ -86,6 +86,13 @@ suspend fun connectSEService(context: Context): SEService = suspendCoroutine { c
}
}
+inline fun Bitmap.use(f: (Bitmap) -> T): T =
+ try {
+ f(this)
+ } finally {
+ recycle()
+ }
+
fun decodeQrFromBitmap(bmp: Bitmap): String? =
runCatching {
val pixels = IntArray(bmp.width * bmp.height)
diff --git a/app-common/src/main/res/drawable/ic_euicc_memory_reset.xml b/app-common/src/main/res/drawable/ic_euicc_memory_reset.xml
new file mode 100644
index 0000000..f1ca8c1
--- /dev/null
+++ b/app-common/src/main/res/drawable/ic_euicc_memory_reset.xml
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/app-common/src/main/res/menu/fragment_euicc.xml b/app-common/src/main/res/menu/fragment_euicc.xml
index b54eaf1..6e2dfbe 100644
--- a/app-common/src/main/res/menu/fragment_euicc.xml
+++ b/app-common/src/main/res/menu/fragment_euicc.xml
@@ -10,4 +10,9 @@
android:id="@+id/euicc_info"
android:title="@string/euicc_info"
app:showAsAction="never" />
+
+