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

Commit 55d96c67 authored by septs's avatar septs Committed by Peter Cai
Browse files

feat: if profile delete confirm text is mismatched then show toast (#110) 

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


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

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

+34 −16
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ import android.app.Dialog 
import android.os.Bundle

import android.os.Bundle

import android.text.Editable

import android.text.Editable

import android.widget.EditText

import android.widget.EditText

import android.widget.Toast

import androidx.appcompat.app.AlertDialog

import androidx.appcompat.app.AlertDialog

import androidx.fragment.app.DialogFragment

import androidx.fragment.app.DialogFragment

import androidx.lifecycle.lifecycleScope

import androidx.lifecycle.lifecycleScope
@@ -16,31 +17,47 @@ import kotlinx.coroutines.launch 
class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {

class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {

    companion object {

    companion object {

        const val TAG = "ProfileDeleteFragment"

        const val TAG = "ProfileDeleteFragment"

        private const val FIELD_ICCID = "iccid"

        private const val FIELD_NAME = "name"





        fun newInstance(slotId: Int, portId: Int, iccid: String, name: String): ProfileDeleteFragment {

        fun newInstance(slotId: Int, portId: Int, iccid: String, name: String): ProfileDeleteFragment {

            val instance = newInstanceEuicc(ProfileDeleteFragment::class.java, slotId, portId)

            val instance = newInstanceEuicc(ProfileDeleteFragment::class.java, slotId, portId)

            instance.requireArguments().apply {

            instance.requireArguments().apply {

                putString("iccid", iccid)

                putString(FIELD_ICCID, iccid)

                putString("name", name)

                putString(FIELD_NAME, name)

            }

            }

            return instance

            return instance

        }

        }

    }

    }





    private val iccid by lazy {

        requireArguments().getString(FIELD_ICCID)!!

    }



    private val name by lazy {

        requireArguments().getString(FIELD_NAME)!!

    }



    private val editText by lazy {

    private val editText by lazy {

        EditText(requireContext()).apply {

        EditText(requireContext()).apply {

            hint = Editable.Factory.getInstance().newEditable(

            hint = Editable.Factory.getInstance()

                getString(R.string.profile_delete_confirm_input, requireArguments().getString("name")!!)

                .newEditable(getString(R.string.profile_delete_confirm_input, name))

            )

        }

        }

    }

    }



    private val inputMatchesName: Boolean

    private val inputMatchesName: Boolean

        get() = editText.text.toString() == requireArguments().getString("name")!!

        get() = editText.text.toString() == name



    private var toast: Toast? = null



    private var deleting = false

    private var deleting = false





    private val alertDialog: AlertDialog

        get() = requireDialog() as AlertDialog



    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =

        AlertDialog.Builder(requireContext(), R.style.AlertDialogTheme).apply {

        AlertDialog.Builder(requireContext(), R.style.AlertDialogTheme).apply {

            setMessage(getString(R.string.profile_delete_confirm, requireArguments().getString("name")))

            setMessage(getString(R.string.profile_delete_confirm, name))

            setView(editText)

            setView(editText)

            setPositiveButton(android.R.string.ok, null) // Set listener to null to prevent auto closing

            setPositiveButton(android.R.string.ok, null) // Set listener to null to prevent auto closing

            setNegativeButton(android.R.string.cancel, null)

            setNegativeButton(android.R.string.cancel, null)
@@ -48,9 +65,8 @@ class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker { 




    override fun onResume() {

    override fun onResume() {

        super.onResume()

        super.onResume()

        val alertDialog = dialog!! as AlertDialog

        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {

        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {

            if (!deleting && inputMatchesName) delete()

            if (!deleting) delete()

        }

        }

        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener {

        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener {

            if (!deleting) dismiss()

            if (!deleting) dismiss()
@@ -58,8 +74,15 @@ class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker { 
    }

    }





    private fun delete() {

    private fun delete() {

        toast?.cancel()

        if (!inputMatchesName) {

            val resId = R.string.toast_profile_delete_confirm_text_mismatched

            toast = Toast.makeText(requireContext(), resId, Toast.LENGTH_LONG).also {

                it.show()

            }

            return

        }

        deleting = true

        deleting = true

        val alertDialog = dialog!! as AlertDialog

        alertDialog.setCanceledOnTouchOutside(false)

        alertDialog.setCanceledOnTouchOutside(false)

        alertDialog.setCancelable(false)

        alertDialog.setCancelable(false)

        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false

        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
@@ -68,12 +91,7 @@ class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker { 
        requireParentFragment().lifecycleScope.launch {

        requireParentFragment().lifecycleScope.launch {

            ensureEuiccChannelManager()

            ensureEuiccChannelManager()

            euiccChannelManagerService.waitForForegroundTask()

            euiccChannelManagerService.waitForForegroundTask()



            euiccChannelManagerService.launchProfileDeleteTask(slotId, portId, iccid).onStart {

            euiccChannelManagerService.launchProfileDeleteTask(

                slotId,

                portId,

                requireArguments().getString("iccid")!!

            ).onStart {

                if (parentFragment is EuiccProfilesChangedListener) {

                if (parentFragment is EuiccProfilesChangedListener) {

                    // Trigger a refresh in the parent fragment -- it should wait until

                    // Trigger a refresh in the parent fragment -- it should wait until

                    // any foreground task is completed before actually doing a refresh

                    // any foreground task is completed before actually doing a refresh

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 




    <string name="toast_profile_enable_failed">Cannot switch to new eSIM profile.</string>

    <string name="toast_profile_enable_failed">Cannot switch to new eSIM profile.</string>

    <string name="toast_profile_name_too_long">Nickname cannot be longer than 64 characters</string>

    <string name="toast_profile_name_too_long">Nickname cannot be longer than 64 characters</string>

    <string name="toast_profile_delete_confirm_text_mismatched">Confirmation string mismatch</string>

    <string name="toast_iccid_copied">ICCID copied to clipboard</string>

    <string name="toast_iccid_copied">ICCID copied to clipboard</string>





    <string name="slot_select">Select Slot</string>

    <string name="slot_select">Select Slot</string>