From 545ae250c14b9a5669622566f0ff8909d16d7255 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 14 Sep 2015 00:47:42 -0400 Subject: [PATCH] Create helper class for code dealing with blocked conversations --- .../common/BlockedConversationHelper.java | 69 +++++++++++++++++++ .../ConversationListFragment.java | 43 ++---------- 2 files changed, 76 insertions(+), 36 deletions(-) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java new file mode 100644 index 00000000..2c606f3f --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java @@ -0,0 +1,69 @@ +package com.moez.QKSMS.common; + +import android.content.SharedPreferences; +import android.provider.Telephony; +import com.moez.QKSMS.ui.settings.SettingsFragment; + +import java.util.HashSet; +import java.util.Set; + +/** + * A set of helper methods to group the logic related to blocked conversation + */ +public class BlockedConversationHelper { + + public static boolean isConversationBlocked(SharedPreferences prefs, long threadId) { + Set idStrings = prefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); + HashSet ids = new HashSet<>(); + for (String s : idStrings) { + ids.add(Long.parseLong(s)); + } + return (ids.contains(threadId)); + } + + public static void blockConversation(SharedPreferences prefs, long threadId) { + Set idStrings = prefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); + idStrings.add(String.valueOf(threadId)); + prefs.edit().putStringSet(SettingsFragment.BLOCKED_SENDERS, idStrings).apply(); + } + + public static void unblockConversation(SharedPreferences prefs, long threadId) { + Set idStrings2 = prefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); + idStrings2.remove(String.valueOf(threadId)); + prefs.edit().putStringSet(SettingsFragment.BLOCKED_SENDERS, idStrings2).apply(); + } + + public static Set getBlockedConversations(SharedPreferences prefs) { + return prefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); + } + + public static String[] getBlockedConversationArray(SharedPreferences prefs) { + Set idStrings = getBlockedConversations(prefs); + Object[] idArray = idStrings.toArray(); + String[] idStringArray = new String[idStrings.size()]; + for (int i = 0; i < idStrings.size(); i++) { + idStringArray[i] = (String) idArray[i]; + } + return idStringArray; + } + + public static String getCursorSelection(SharedPreferences prefs) { + 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 ("); + + Set idStrings = getBlockedConversations(prefs); + for (int i = 0; i < idStrings.size(); i++) { + selection.append("?"); + if (i < idStrings.size() - 1) { + selection.append(","); + } + } + selection.append(")"); + + return selection.toString(); + } +} 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 5296826a..2f1fd562 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 @@ -10,7 +10,6 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.os.Bundle; import android.preference.PreferenceManager; -import android.provider.Telephony; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -22,6 +21,7 @@ import android.view.ViewGroup; import android.widget.AdapterView; import com.melnykov.fab.FloatingActionButton; import com.moez.QKSMS.R; +import com.moez.QKSMS.common.BlockedConversationHelper; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.LiveViewManager; @@ -41,9 +41,6 @@ import com.moez.QKSMS.ui.dialog.ConversationNotificationSettingsDialog; import com.moez.QKSMS.ui.dialog.QKDialog; import com.moez.QKSMS.ui.settings.SettingsFragment; -import java.util.HashSet; -import java.util.Set; - public class ConversationListFragment extends QKFragment implements LoaderManager.LoaderCallbacks, LiveView, RecyclerCursorAdapter.ItemClickListener, RecyclerCursorAdapter.MultiSelectListener { @@ -198,12 +195,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage } if (mPrefs.getBoolean(SettingsFragment.BLOCKED_ENABLED, false)) { - Set idStrings = mPrefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); - HashSet ids = new HashSet<>(); - for (String s : idStrings) { - ids.add(Long.parseLong(s)); - } - if (ids.contains(conversation.getThreadId())) { + if (BlockedConversationHelper.isConversationBlocked(mPrefs, conversation.getThreadId())) { dialog.addMenuItem(R.string.menu_unblock_conversation, MENU_UNBLOCK_CONVERSATION); } else { dialog.addMenuItem(R.string.menu_block_conversation, MENU_BLOCK_CONVERSATION); @@ -249,15 +241,11 @@ public class ConversationListFragment extends QKFragment implements LoaderManage break; case MENU_BLOCK_CONVERSATION: - Set idStrings = mPrefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); - idStrings.add(String.valueOf(conversation.getThreadId())); - mPrefs.edit().putStringSet(SettingsFragment.BLOCKED_SENDERS, idStrings).apply(); + BlockedConversationHelper.blockConversation(mPrefs, conversation.getThreadId()); break; case MENU_UNBLOCK_CONVERSATION: - Set idStrings2 = mPrefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); - idStrings2.remove(String.valueOf(conversation.getThreadId())); - mPrefs.edit().putStringSet(SettingsFragment.BLOCKED_SENDERS, idStrings2).apply(); + BlockedConversationHelper.unblockConversation(mPrefs, conversation.getThreadId()); break; case MENU_MARK_READ: @@ -316,27 +304,10 @@ public class ConversationListFragment extends QKFragment implements LoaderManage } public Loader onCreateLoader(int id, Bundle args) { - 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 ("); - Set idStrings = mPrefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); - Object[] idArray = idStrings.toArray(); - String[] idStringArray = new String[idStrings.size()]; - for (int i = 0; i < idStrings.size(); i++) { - idStringArray[i] = (String) idArray[i]; - selection.append("?"); - if (i < idStrings.size() - 1) { - selection.append(","); - } - } - selection.append(")"); - - return new CursorLoader(mContext, SmsHelper.CONVERSATIONS_CONTENT_PROVIDER, - Conversation.ALL_THREADS_PROJECTION, selection.toString(), idStringArray, "date DESC"); + return new CursorLoader(mContext, SmsHelper.CONVERSATIONS_CONTENT_PROVIDER, Conversation.ALL_THREADS_PROJECTION, + BlockedConversationHelper.getCursorSelection(mPrefs), + BlockedConversationHelper.getBlockedConversationArray(mPrefs), "date DESC"); } public void onLoadFinished(Loader loader, Cursor data) {