From 2904aada6581b888ae3ab0b7e4ea4081d388e172 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 17 Sep 2015 22:21:37 -0400 Subject: [PATCH] Update menu item count using actual value --- .../common/BlockedConversationHelper.java | 71 +++++++++++++++++-- .../ConversationListFragment.java | 18 +++-- QKSMS/src/main/res/menu/coversation_list.xml | 2 +- QKSMS/src/main/res/values/strings.xml | 3 +- 4 files changed, 82 insertions(+), 12 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java index b60e5862..0c702b87 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java @@ -2,9 +2,17 @@ package com.moez.QKSMS.common; import android.content.Context; import android.content.SharedPreferences; +import android.database.Cursor; +import android.net.Uri; +import android.os.AsyncTask; import android.provider.Telephony; +import android.util.Log; import android.view.MenuItem; import com.moez.QKSMS.R; +import com.moez.QKSMS.data.Conversation; +import com.moez.QKSMS.data.Message; +import com.moez.QKSMS.transaction.SmsHelper; +import com.moez.QKSMS.ui.messagelist.MessageColumns; import com.moez.QKSMS.ui.settings.SettingsFragment; import java.util.HashSet; @@ -50,13 +58,14 @@ public class BlockedConversationHelper { return idStringArray; } - public static String getCursorSelection(SharedPreferences prefs) { + public static String getCursorSelection(SharedPreferences prefs, boolean blocked) { StringBuilder selection = new StringBuilder(); selection.append(Telephony.Threads.MESSAGE_COUNT); selection.append(" != 0"); selection.append(" AND "); selection.append(Telephony.Threads._ID); - selection.append(" NOT IN ("); + if (!blocked) selection.append(" NOT"); + selection.append(" IN ("); Set idStrings = getBlockedConversations(prefs); for (int i = 0; i < idStrings.size(); i++) { @@ -74,13 +83,65 @@ public class BlockedConversationHelper { * If the user has message blocking enabled, then in the menu of the conversation list, there's an item that says * Blocked (#). This method will find the number of blocked unread messages to show in that menu item and bind it */ - public static void bindBlockedMenuItem(Context context, SharedPreferences prefs, MenuItem item) { + public static void bindBlockedMenuItem(final Context context, final SharedPreferences prefs, final MenuItem item, boolean showBlocked) { + Log.d("BlockedConversationHelper", "bindBlockedMenuItem"); if (item == null) { + Log.d("BlockedConversationHelper", "item is null"); return; } - item.setVisible(prefs.getBoolean(SettingsFragment.BLOCKED_ENABLED, false)); - item.setTitle(context.getString(R.string.menu_blocked_conversations, 4)); + new BindMenuItemTask(context, prefs, item, showBlocked).execute((Void[]) null); + } + private static class BindMenuItemTask extends AsyncTask { + + private Context mContext; + private SharedPreferences mPrefs; + private MenuItem mMenuItem; + private boolean mShowBlocked; + + private BindMenuItemTask(Context context, SharedPreferences prefs, MenuItem item, boolean showBlocked) { + mContext = context; + mPrefs = prefs; + mMenuItem = item; + mShowBlocked = showBlocked; + } + + @Override + protected void onPreExecute() { + super.onPreExecute(); + mMenuItem.setVisible(mPrefs.getBoolean(SettingsFragment.BLOCKED_ENABLED, false)); + mMenuItem.setTitle(mContext.getString(mShowBlocked ? R.string.menu_unblocked_conversations : R.string.menu_blocked_conversations, "...")); + } + + @Override + protected Integer doInBackground(Void... params) { + int unreadCount = 0; + + // Create a cursor for the conversation list + Cursor conversationCursor = mContext.getContentResolver().query( + SmsHelper.CONVERSATIONS_CONTENT_PROVIDER, Conversation.ALL_THREADS_PROJECTION, + getCursorSelection(mPrefs, !mShowBlocked), getBlockedConversationArray(mPrefs), SmsHelper.sortDateDesc); + + if (conversationCursor.moveToFirst()) { + do { + Uri threadUri = Uri.withAppendedPath(Message.MMS_SMS_CONTENT_PROVIDER, conversationCursor.getString(Conversation.ID)); + Cursor messageCursor = mContext.getContentResolver().query(threadUri, MessageColumns.PROJECTION, + SmsHelper.UNREAD_SELECTION, null, SmsHelper.sortDateDesc); + unreadCount += messageCursor.getCount(); + messageCursor.close(); + } while (conversationCursor.moveToNext()); + } + + conversationCursor.close(); + return unreadCount; + } + + @Override + protected void onPostExecute(Integer integer) { + super.onPostExecute(integer); + Log.d("BindMenuItemTask", "onPostExecute: " + integer); + mMenuItem.setTitle(mContext.getString(mShowBlocked ? R.string.menu_unblocked_conversations : R.string.menu_blocked_conversations, integer)); + } } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java index a7b1cff9..191154f6 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java @@ -66,6 +66,8 @@ public class ConversationListFragment extends QKFragment implements LoaderManage private ConversationDetailsDialog mConversationDetailsDialog; private QKActivity mContext; private SharedPreferences mPrefs; + private MenuItem mBlockedItem; + private boolean mShowBlocked = false; // This does not hold the current position of the list, rather the position the list is pending being set to private int mPosition; @@ -140,7 +142,8 @@ public class ConversationListFragment extends QKFragment implements LoaderManage mAdapter.disableMultiSelectMode(false); } - BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, menu.findItem(R.id.blocked)); + mBlockedItem = menu.findItem(R.id.menu_blocked); + BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, mBlockedItem, mShowBlocked); } @Override @@ -149,12 +152,19 @@ public class ConversationListFragment extends QKFragment implements LoaderManage case R.id.menu_delete: DialogHelper.showDeleteConversationsDialog((MainActivity) mContext, mAdapter); return true; + case R.id.menu_mark_read: for (long threadId : mAdapter.getSelectedItems()) { new ConversationLegacy(mContext, threadId).markRead(); } mAdapter.disableMultiSelectMode(true); return true; + + case R.id.menu_blocked: + mShowBlocked = !mShowBlocked; + BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, mBlockedItem, mShowBlocked); + initLoaderManager(); + return true; } return super.onOptionsItemSelected(item); @@ -265,6 +275,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage case MENU_DELETE_CONVERSATION: DialogHelper.showDeleteConversationDialog((MainActivity) mContext, threadId); break; + case MENU_DELETE_FAILED: //Deletes all failed messages from all conversations DialogHelper.showDeleteFailedMessagesDialog((MainActivity) mContext, threadId); @@ -300,15 +311,12 @@ public class ConversationListFragment extends QKFragment implements LoaderManage @Override public void onDestroy() { super.onDestroy(); - LiveViewManager.unregisterView(this); - } public Loader onCreateLoader(int id, Bundle args) { - return new CursorLoader(mContext, SmsHelper.CONVERSATIONS_CONTENT_PROVIDER, Conversation.ALL_THREADS_PROJECTION, - BlockedConversationHelper.getCursorSelection(mPrefs), + BlockedConversationHelper.getCursorSelection(mPrefs, mShowBlocked), BlockedConversationHelper.getBlockedConversationArray(mPrefs), "date DESC"); } diff --git a/QKSMS/src/main/res/menu/coversation_list.xml b/QKSMS/src/main/res/menu/coversation_list.xml index 51850307..4fdd79e2 100644 --- a/QKSMS/src/main/res/menu/coversation_list.xml +++ b/QKSMS/src/main/res/menu/coversation_list.xml @@ -26,7 +26,7 @@ android:title="@string/menu_settings" /> diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index c9d3aade..6bf1ac92 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -634,7 +634,8 @@ Unmute conversation Block conversation Unblock conversation - Blocked (%s) + Blocked (%s new) + Messages (%s new) Notification settings View details Mark read