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 cf42559b..707505c0 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 @@ -4,10 +4,12 @@ import android.app.Fragment; import android.app.LoaderManager; import android.content.CursorLoader; import android.content.Loader; +import android.content.SharedPreferences; import android.database.Cursor; 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; @@ -39,6 +41,9 @@ 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 { @@ -54,6 +59,8 @@ public class ConversationListFragment extends QKFragment implements LoaderManage private final int MENU_DELETE_FAILED = 6; private final int MENU_DELETE_CONVERSATION = 7; private final int MENU_MULTI_SELECT = 8; + private final int MENU_BLOCK_CONVERSATION = 9; + private final int MENU_UNBLOCK_CONVERSATION = 10; private RecyclerView mRecyclerView; private FloatingActionButton mFab; @@ -61,6 +68,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage private LinearLayoutManager mLayoutManager; private ConversationDetailsDialog mConversationDetailsDialog; private QKActivity mContext; + private SharedPreferences mPrefs; // This does not hold the current position of the list, rather the position the list is pending being set to private int mPosition; @@ -70,6 +78,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage super.onCreate(savedInstanceState); mContext = (QKActivity) getActivity(); + mPrefs = PreferenceManager.getDefaultSharedPreferences(mContext); setHasOptionsMenu(true); mAdapter = new ConversationListAdapter(mContext); @@ -188,6 +197,19 @@ public class ConversationListFragment extends QKFragment implements LoaderManage dialog.addMenuItem(R.string.menu_mute_conversation, MENU_MUTE_CONVERSATION); } + 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())) { + dialog.addMenuItem(R.string.menu_unblock_conversation, MENU_UNBLOCK_CONVERSATION); + } else { + dialog.addMenuItem(R.string.menu_block_conversation, MENU_BLOCK_CONVERSATION); + } + } + if (conversation.hasUnreadMessages()) { dialog.addMenuItem(R.string.menu_mark_read, MENU_MARK_READ); } else { @@ -219,13 +241,25 @@ public class ConversationListFragment extends QKFragment implements LoaderManage case MENU_NOTIFICATION_SETTINGS: ConversationNotificationSettingsDialog.newInstance(threadId, name).setContext(mContext) - .show(((MainActivity) mContext).getFragmentManager(), "notification prefs"); + .show(mContext.getFragmentManager(), "notification prefs"); break; case MENU_VIEW_DETAILS: mConversationDetailsDialog.showDetails(conversation); 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(); + 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(); + break; + case MENU_MARK_READ: new ConversationLegacy(mContext, threadId).markRead(); break; @@ -284,7 +318,7 @@ 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(" != 0"); return new CursorLoader(mContext, SmsHelper.CONVERSATIONS_CONTENT_PROVIDER, Conversation.ALL_THREADS_PROJECTION, selection.toString(), null, "date DESC"); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index facb4381..1c279e4a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -111,6 +111,8 @@ public class SettingsFragment extends PreferenceFragment implements public static final String DELIVERY_TOAST = "pref_key_delivery_toast"; public static final String DELIVERY_VIBRATE = "pref_key_delivery_vibrate"; public static final String YAPPY = "pref_key_endlessjabber"; + public static final String BLOCKED_ENABLED = "pref_key_blocked_enabled"; + public static final String BLOCKED_SENDERS = "pref_key_blocked_senders"; public static final String MOBILE_ONLY = "pref_key_mobile_only"; public static final String COMPOSE_GROUP = "pref_key_compose_group"; public static final String SPLIT_SMS = "pref_key_split"; diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 927af657..5fac3599 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -164,6 +164,8 @@ Vibrate on message delivery Yappy integration Enable full support for Yappy + Blocked senders + Long-press on a conversation to block messages Mobile numbers Only show mobile numbers in contact suggestions Automatic emoji @@ -630,6 +632,8 @@ Mute conversation Unmute conversation + Block conversation + Unblock conversation Notification settings View details Mark read diff --git a/QKSMS/src/main/res/xml/settings_general.xml b/QKSMS/src/main/res/xml/settings_general.xml index 8d9b0e78..4f413e6e 100644 --- a/QKSMS/src/main/res/xml/settings_general.xml +++ b/QKSMS/src/main/res/xml/settings_general.xml @@ -89,6 +89,13 @@ +