Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 755499e8 authored by septs's avatar septs Committed by Peter Cai
Browse files

refactor: remove euicc memory reset preference (#266) 

Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/266


Co-authored-by: default avatarsepts <github@septs.pw>
Co-committed-by: default avatarsepts <github@septs.pw>
parent 6b0e058d

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

+3 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener, 
    private lateinit var profileList: RecyclerView

    private var logicalSlotId: Int = -1

    private lateinit var eid: String

    private var enabledProfile: LocalProfileInfo? = null



    private val adapter = EuiccProfileAdapter()
@@ -146,7 +147,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener, 
        menu.findItem(R.id.euicc_info).isVisible =

            logicalSlotId != -1

        menu.findItem(R.id.euicc_memory_reset).isVisible =

            runBlocking { preferenceRepository.euiccMemoryResetFlow.first() }

            enabledProfile == null

    }



    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
@@ -214,6 +215,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener, 
        val profiles = withEuiccChannel { channel ->

            logicalSlotId = channel.logicalSlotId

            eid = channel.lpa.eID

            enabledProfile = channel.lpa.profiles.enabled

            euiccChannelManager.notifyEuiccProfilesChanged(channel.logicalSlotId)

            if (unfilteredProfileListFlow.value)

                channel.lpa.profiles

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

+0 −3
Original line number Diff line number Diff line
@@ -81,9 +81,6 @@ open class SettingsFragment: PreferenceFragmentCompat() { 
        requirePreference<CheckBoxPreference>("pref_developer_refresh_after_switch")

            .bindBooleanFlow(preferenceRepository.refreshAfterSwitchFlow)



        requirePreference<CheckBoxPreference>("pref_developer_euicc_memory_reset")

            .bindBooleanFlow(preferenceRepository.euiccMemoryResetFlow)



        requirePreference<ListPreference>("pref_developer_es10x_mss")

            .bindIntFlow(preferenceRepository.es10xMssFlow, 63)

app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt

+0 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ internal object PreferenceKeys { 
    val REFRESH_AFTER_SWITCH = booleanPreferencesKey("refresh_after_switch")

    val UNFILTERED_PROFILE_LIST = booleanPreferencesKey("unfiltered_profile_list")

    val IGNORE_TLS_CERTIFICATE = booleanPreferencesKey("ignore_tls_certificate")

    val EUICC_MEMORY_RESET = booleanPreferencesKey("euicc_memory_reset")

    val ISDR_AID_LIST = stringPreferencesKey("isdr_aid_list")

    val ES10X_MSS = intPreferencesKey("es10x_mss")

}
@@ -91,7 +90,6 @@ open class PreferenceRepository(private val context: Context) { 
    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)

    val isdrAidListFlow = bindFlow(

        PreferenceKeys.ISDR_AID_LIST,

        PreferenceConstants.DEFAULT_AID_LIST,

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

+0 −2
Original line number Diff line number Diff line
@@ -183,8 +183,6 @@ 
    <string name="pref_developer_unfiltered_profile_list_desc">非運用のプロファイルも含めるようにします。</string>

    <string name="pref_developer_ignore_tls_certificate">SM-DP+ TLS 証明書を無視する</string>

    <string name="pref_developer_ignore_tls_certificate_desc">RSP サーバーで使用される TLS 証明書を受け入れます。</string>

    <string name="pref_developer_euicc_memory_reset">eSIM の初期化を許可</string>

    <string name="pref_developer_euicc_memory_reset_desc">これは危険な操作であり、デフォルトでは非表示になっています。代わりとしてすべてのプロファイルを手動で削除することもできます。</string>

    <string name="pref_developer_es10x_mss_desc">グローバル ES10x MSS を設定します。</string>

    <string-array name="pref_developer_es10x_entry_keys">

        <item>高効率</item>

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

+0 −2
Original line number Diff line number Diff line
@@ -166,8 +166,6 @@ 
    <string name="euicc_memory_reset_hint_text">请在此处输入「%s」以确认</string>

    <string name="euicc_memory_reset_confirm_text">我确认擦除 EID 以 %s 结尾的芯片，并了解此操作不可逆</string>

    <string name="euicc_memory_reset_invoke_button">擦除</string>

    <string name="pref_developer_euicc_memory_reset">允许擦除 eSIM</string>

    <string name="pref_developer_euicc_memory_reset_desc">此操作是默认隐藏的危险操作。作为替代方案，您可以手动删除所有配置文件。</string>

    <string name="pref_developer_refresh_after_switch">向基带发送刷新命令</string>

    <string name="pref_developer_isdr_aid_list">自定义 ISD-R AID 列表</string>

    <string name="isdr_aid_list_restore_defaults">重置</string>