diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt index 104a305b..5159f07e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt @@ -240,7 +240,8 @@ class SettingsController : QkController { cont -> 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) } .setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) } .setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt index a00d5a6f..df35038f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt @@ -267,6 +267,10 @@ class SettingsPresenter @Inject constructor( } val counts = messageRepo.getOldMessageCounts(maxAge) + if (counts.values.sum() == 0) { + return@filter true + } + runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) } } .doOnNext { maxAge -> diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 50f4752a..1261abf0 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -262,7 +262,8 @@ Messages will be deleted after the specified number of days Number of days Never - Are you sure you would like to enable this setting? %1$d messages will be deleted + Delete old messages automatically? + If you proceed, %1$d messages will be deleted now Never After 1 day