From e4a27ba7e9a1fe33967ca615273351f709ed10be Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 31 Oct 2015 11:57:24 -0400 Subject: [PATCH] Improve messages for multi-delete --- .../com/moez/QKSMS/common/DialogHelper.java | 20 ++++++++++--------- QKSMS/src/main/res/values/strings.xml | 6 +++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java index dba2fbc3..6a9a8b5b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java @@ -22,21 +22,21 @@ public class DialogHelper { } public static void showDeleteConversationsDialog(final MainActivity context, final Set threadIds) { - new DefaultSmsHelper(context, R.string.not_default_delete).showIfNotDefault(null); + Set threads = new HashSet<>(threadIds); // Make a copy so the list isn't reset when multi-select is disabled new QKDialog() .setContext(context) .setTitle(R.string.delete_conversation) - .setMessage(R.string.delete_confirmation) + .setMessage(context.getString(R.string.delete_confirmation, threads.size())) .setPositiveButton(R.string.yes, v -> { - Log.d(TAG, "Deleting threads: " + Arrays.toString(threadIds.toArray())); + Log.d(TAG, "Deleting threads: " + Arrays.toString(threads.toArray())); Conversation.ConversationQueryHandler handler = new Conversation.ConversationQueryHandler(context.getContentResolver()); - - Conversation.startDelete(handler, 0, false, threadIds); + Conversation.startDelete(handler, 0, false, threads); Conversation.asyncDeleteObsoleteThreads(handler, 0); context.showMenu(); - }).setNegativeButton(R.string.cancel, null) + }) + .setNegativeButton(R.string.cancel, null) .show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); } @@ -44,17 +44,19 @@ public class DialogHelper { public static void showDeleteFailedMessagesDialog(final MainActivity context, final Set threadIds) { new DefaultSmsHelper(context, R.string.not_default_delete).showIfNotDefault(null); + Set threads = new HashSet<>(threadIds); // Make a copy so the list isn't reset when multi-select is disabled new QKDialog() .setContext(context) .setTitle(R.string.delete_all_failed) - .setMessage(R.string.delete_all_failed_confirmation) + .setMessage(context.getString(R.string.delete_all_failed_confirmation, threads.size())) .setPositiveButton(R.string.yes, v -> { new Thread(() -> { - for (long threadId : threadIds) { + for (long threadId : threads) { SmsHelper.deleteFailedMessages(context, threadId); } }).start(); - }).setNegativeButton(R.string.cancel, null) + }) + .setNegativeButton(R.string.cancel, null) .show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); } diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index c1d378e8..10bc16eb 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -344,13 +344,13 @@ These changes will take effect the next time QKSMS is opened - Delete conversation + Delete conversations Delete failed messages - Are you sure you would like to delete the conversation? + Are you sure you would like to delete (%s) conversations? - Are you sure you would like to all failed messages? + Are you sure you would like to delete failed messages from (%s) conversations? APNs not set