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

Commit e6f216fa authored by Moez Bhatti's avatar Moez Bhatti
Browse files

Auto delete warning popup improvements

parent e51cdfe6

presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt

+2 −1
Original line number Original line Diff line number Diff line
@@ -240,7 +240,8 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre 
    override suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean = withContext(Dispatchers.Main) {

    override suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean = withContext(Dispatchers.Main) {

        suspendCancellableCoroutine<Boolean> { cont ->

        suspendCancellableCoroutine<Boolean> { cont ->

            AlertDialog.Builder(activity!!)

            AlertDialog.Builder(activity!!)

                    .setMessage(context.resources.getString(R.string.settings_auto_delete_warning, messages))

                    .setTitle(R.string.settings_auto_delete_warning)

                    .setMessage(context.resources.getString(R.string.settings_auto_delete_warning_message, messages))

                    .setOnCancelListener { cont.resume(false) }

                    .setOnCancelListener { cont.resume(false) }

                    .setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) }

                    .setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) }

                    .setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) }

                    .setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) }

presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt

+4 −0
Original line number Original line Diff line number Diff line
@@ -267,6 +267,10 @@ class SettingsPresenter @Inject constructor( 
                    }

                    }





                    val counts = messageRepo.getOldMessageCounts(maxAge)

                    val counts = messageRepo.getOldMessageCounts(maxAge)

                    if (counts.values.sum() == 0) {

                        return@filter true

                    }



                    runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) }

                    runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) }

                }

                }

                .doOnNext { maxAge ->

                .doOnNext { maxAge ->

presentation/src/main/res/values/strings.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -262,7 +262,8 @@ 
    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>

    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>

    <string name="settings_auto_delete_dialog_hint">Number of days</string>

    <string name="settings_auto_delete_dialog_hint">Number of days</string>

    <string name="settings_auto_delete_never">Never</string>

    <string name="settings_auto_delete_never">Never</string>

    <string name="settings_auto_delete_warning">Are you sure you would like to enable this setting? %1$d messages will be deleted</string>

    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>

    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>

    <plurals name="settings_auto_delete_summary">

    <plurals name="settings_auto_delete_summary">

        <item quantity="zero">Never</item>

        <item quantity="zero">Never</item>

        <item quantity="one">After 1 day</item>

        <item quantity="one">After 1 day</item>