forked from upstream-mirrors/quik
Add preference and data persistence for blocked threads
This commit is contained in:
+36
-2
@@ -4,10 +4,12 @@ import android.app.Fragment;
|
|||||||
import android.app.LoaderManager;
|
import android.app.LoaderManager;
|
||||||
import android.content.CursorLoader;
|
import android.content.CursorLoader;
|
||||||
import android.content.Loader;
|
import android.content.Loader;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
import android.database.Cursor;
|
import android.database.Cursor;
|
||||||
import android.graphics.PorterDuff;
|
import android.graphics.PorterDuff;
|
||||||
import android.graphics.PorterDuffColorFilter;
|
import android.graphics.PorterDuffColorFilter;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.preference.PreferenceManager;
|
||||||
import android.provider.Telephony;
|
import android.provider.Telephony;
|
||||||
import android.support.v7.widget.LinearLayoutManager;
|
import android.support.v7.widget.LinearLayoutManager;
|
||||||
import android.support.v7.widget.RecyclerView;
|
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.dialog.QKDialog;
|
||||||
import com.moez.QKSMS.ui.settings.SettingsFragment;
|
import com.moez.QKSMS.ui.settings.SettingsFragment;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
|
||||||
public class ConversationListFragment extends QKFragment implements LoaderManager.LoaderCallbacks<Cursor>, LiveView,
|
public class ConversationListFragment extends QKFragment implements LoaderManager.LoaderCallbacks<Cursor>, LiveView,
|
||||||
RecyclerCursorAdapter.ItemClickListener<Conversation>, RecyclerCursorAdapter.MultiSelectListener {
|
RecyclerCursorAdapter.ItemClickListener<Conversation>, 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_FAILED = 6;
|
||||||
private final int MENU_DELETE_CONVERSATION = 7;
|
private final int MENU_DELETE_CONVERSATION = 7;
|
||||||
private final int MENU_MULTI_SELECT = 8;
|
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 RecyclerView mRecyclerView;
|
||||||
private FloatingActionButton mFab;
|
private FloatingActionButton mFab;
|
||||||
@@ -61,6 +68,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
|
|||||||
private LinearLayoutManager mLayoutManager;
|
private LinearLayoutManager mLayoutManager;
|
||||||
private ConversationDetailsDialog mConversationDetailsDialog;
|
private ConversationDetailsDialog mConversationDetailsDialog;
|
||||||
private QKActivity mContext;
|
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
|
// This does not hold the current position of the list, rather the position the list is pending being set to
|
||||||
private int mPosition;
|
private int mPosition;
|
||||||
@@ -70,6 +78,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
|
|||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
mContext = (QKActivity) getActivity();
|
mContext = (QKActivity) getActivity();
|
||||||
|
mPrefs = PreferenceManager.getDefaultSharedPreferences(mContext);
|
||||||
setHasOptionsMenu(true);
|
setHasOptionsMenu(true);
|
||||||
|
|
||||||
mAdapter = new ConversationListAdapter(mContext);
|
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);
|
dialog.addMenuItem(R.string.menu_mute_conversation, MENU_MUTE_CONVERSATION);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mPrefs.getBoolean(SettingsFragment.BLOCKED_ENABLED, false)) {
|
||||||
|
Set<String> idStrings = mPrefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet<String>());
|
||||||
|
HashSet<Long> 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()) {
|
if (conversation.hasUnreadMessages()) {
|
||||||
dialog.addMenuItem(R.string.menu_mark_read, MENU_MARK_READ);
|
dialog.addMenuItem(R.string.menu_mark_read, MENU_MARK_READ);
|
||||||
} else {
|
} else {
|
||||||
@@ -219,13 +241,25 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
|
|||||||
|
|
||||||
case MENU_NOTIFICATION_SETTINGS:
|
case MENU_NOTIFICATION_SETTINGS:
|
||||||
ConversationNotificationSettingsDialog.newInstance(threadId, name).setContext(mContext)
|
ConversationNotificationSettingsDialog.newInstance(threadId, name).setContext(mContext)
|
||||||
.show(((MainActivity) mContext).getFragmentManager(), "notification prefs");
|
.show(mContext.getFragmentManager(), "notification prefs");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MENU_VIEW_DETAILS:
|
case MENU_VIEW_DETAILS:
|
||||||
mConversationDetailsDialog.showDetails(conversation);
|
mConversationDetailsDialog.showDetails(conversation);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case MENU_BLOCK_CONVERSATION:
|
||||||
|
Set<String> idStrings = mPrefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet<String>());
|
||||||
|
idStrings.add(String.valueOf(conversation.getThreadId()));
|
||||||
|
mPrefs.edit().putStringSet(SettingsFragment.BLOCKED_SENDERS, idStrings).apply();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case MENU_UNBLOCK_CONVERSATION:
|
||||||
|
Set<String> idStrings2 = mPrefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet<String>());
|
||||||
|
idStrings2.remove(String.valueOf(conversation.getThreadId()));
|
||||||
|
mPrefs.edit().putStringSet(SettingsFragment.BLOCKED_SENDERS, idStrings2).apply();
|
||||||
|
break;
|
||||||
|
|
||||||
case MENU_MARK_READ:
|
case MENU_MARK_READ:
|
||||||
new ConversationLegacy(mContext, threadId).markRead();
|
new ConversationLegacy(mContext, threadId).markRead();
|
||||||
break;
|
break;
|
||||||
@@ -284,7 +318,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
|
|||||||
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
|
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
|
||||||
StringBuilder selection = new StringBuilder();
|
StringBuilder selection = new StringBuilder();
|
||||||
selection.append(Telephony.Threads.MESSAGE_COUNT);
|
selection.append(Telephony.Threads.MESSAGE_COUNT);
|
||||||
selection.append(" != 0");
|
selection.append(" != 0");
|
||||||
|
|
||||||
return new CursorLoader(mContext, SmsHelper.CONVERSATIONS_CONTENT_PROVIDER,
|
return new CursorLoader(mContext, SmsHelper.CONVERSATIONS_CONTENT_PROVIDER,
|
||||||
Conversation.ALL_THREADS_PROJECTION, selection.toString(), null, "date DESC");
|
Conversation.ALL_THREADS_PROJECTION, selection.toString(), null, "date DESC");
|
||||||
|
|||||||
@@ -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_TOAST = "pref_key_delivery_toast";
|
||||||
public static final String DELIVERY_VIBRATE = "pref_key_delivery_vibrate";
|
public static final String DELIVERY_VIBRATE = "pref_key_delivery_vibrate";
|
||||||
public static final String YAPPY = "pref_key_endlessjabber";
|
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 MOBILE_ONLY = "pref_key_mobile_only";
|
||||||
public static final String COMPOSE_GROUP = "pref_key_compose_group";
|
public static final String COMPOSE_GROUP = "pref_key_compose_group";
|
||||||
public static final String SPLIT_SMS = "pref_key_split";
|
public static final String SPLIT_SMS = "pref_key_split";
|
||||||
|
|||||||
@@ -164,6 +164,8 @@
|
|||||||
<string name="pref_delivery_vibrate_summary">Vibrate on message delivery</string>
|
<string name="pref_delivery_vibrate_summary">Vibrate on message delivery</string>
|
||||||
<string name="pref_yappy">Yappy integration</string>
|
<string name="pref_yappy">Yappy integration</string>
|
||||||
<string name="pref_endlessjabber_summary">Enable full support for Yappy</string>
|
<string name="pref_endlessjabber_summary">Enable full support for Yappy</string>
|
||||||
|
<string name="pref_blocked_senders">Blocked senders</string>
|
||||||
|
<string name="pref_blocked_senders_summary">Long-press on a conversation to block messages</string>
|
||||||
<string name="pref_mobile_only">Mobile numbers</string>
|
<string name="pref_mobile_only">Mobile numbers</string>
|
||||||
<string name="pref_mobile_only_summary">Only show mobile numbers in contact suggestions</string>
|
<string name="pref_mobile_only_summary">Only show mobile numbers in contact suggestions</string>
|
||||||
<string name="pref_auto_emoji">Automatic emoji</string>
|
<string name="pref_auto_emoji">Automatic emoji</string>
|
||||||
@@ -630,6 +632,8 @@
|
|||||||
<string name="menu_mute_conversation">Mute conversation</string>
|
<string name="menu_mute_conversation">Mute conversation</string>
|
||||||
<!--Menu option to mute conversation-->
|
<!--Menu option to mute conversation-->
|
||||||
<string name="menu_unmute_conversation">Unmute conversation</string>
|
<string name="menu_unmute_conversation">Unmute conversation</string>
|
||||||
|
<string name="menu_block_conversation">Block conversation</string>
|
||||||
|
<string name="menu_unblock_conversation">Unblock conversation</string>
|
||||||
<string name="menu_notification_settings">Notification settings</string>
|
<string name="menu_notification_settings">Notification settings</string>
|
||||||
<string name="menu_view_details">View details</string>
|
<string name="menu_view_details">View details</string>
|
||||||
<string name="menu_mark_read">Mark read</string>
|
<string name="menu_mark_read">Mark read</string>
|
||||||
|
|||||||
@@ -89,6 +89,13 @@
|
|||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:layout="@layout/list_item_preference_category"
|
android:layout="@layout/list_item_preference_category"
|
||||||
android:title="@string/pref_category_general">
|
android:title="@string/pref_category_general">
|
||||||
|
<CheckBoxPreference
|
||||||
|
android:defaultValue="false"
|
||||||
|
android:key="pref_key_blocked_enabled"
|
||||||
|
android:layout="@layout/list_item_preference"
|
||||||
|
android:summary="@string/pref_blocked_senders_summary"
|
||||||
|
android:title="@string/pref_blocked_senders"
|
||||||
|
android:widgetLayout="@layout/view_checkbox" />
|
||||||
<CheckBoxPreference
|
<CheckBoxPreference
|
||||||
android:defaultValue="false"
|
android:defaultValue="false"
|
||||||
android:key="pref_key_mobile_only"
|
android:key="pref_key_mobile_only"
|
||||||
|
|||||||
Reference in New Issue
Block a user