From 151e049abf43b2396c8beb423412390622a6da26 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 13 Sep 2015 22:12:23 -0400 Subject: [PATCH 01/17] Use StringBuilder for conversation loader selection --- .../ui/conversationlist/ConversationListFragment.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 2fc9090e..cf42559b 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 @@ -282,9 +282,12 @@ public class ConversationListFragment extends QKFragment implements LoaderManage } public Loader onCreateLoader(int id, Bundle args) { - final String SELECTION = Telephony.Threads.MESSAGE_COUNT + "!= 0"; + StringBuilder selection = new StringBuilder(); + selection.append(Telephony.Threads.MESSAGE_COUNT); + selection.append(" != 0"); + return new CursorLoader(mContext, SmsHelper.CONVERSATIONS_CONTENT_PROVIDER, - Conversation.ALL_THREADS_PROJECTION, SELECTION, null, "date DESC"); + Conversation.ALL_THREADS_PROJECTION, selection.toString(), null, "date DESC"); } public void onLoadFinished(Loader loader, Cursor data) { From 9396e4788004d3cd5fb06cb25f39dcd766b2ba8e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 13 Sep 2015 23:37:37 -0400 Subject: [PATCH 02/17] Add preference and data persistence for blocked threads --- .../ConversationListFragment.java | 38 ++++++++++++++++++- .../QKSMS/ui/settings/SettingsFragment.java | 2 + QKSMS/src/main/res/values/strings.xml | 4 ++ QKSMS/src/main/res/xml/settings_general.xml | 7 ++++ 4 files changed, 49 insertions(+), 2 deletions(-) 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 @@ + Date: Mon, 14 Sep 2015 00:08:30 -0400 Subject: [PATCH 03/17] Don't show blocked threads in main view --- .../ConversationListFragment.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 707505c0..ae175b64 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 @@ -319,9 +319,24 @@ public class ConversationListFragment extends QKFragment implements LoaderManage StringBuilder selection = new StringBuilder(); selection.append(Telephony.Threads.MESSAGE_COUNT); selection.append(" != 0"); + selection.append(" AND "); + selection.append(Telephony.Threads._ID); + selection.append(" != ("); + + 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(), null, "date DESC"); + Conversation.ALL_THREADS_PROJECTION, selection.toString(), idStringArray, "date DESC"); } public void onLoadFinished(Loader loader, Cursor data) { From 999266989174a69f99c285691c1b59b4e90ee67a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 14 Sep 2015 00:28:24 -0400 Subject: [PATCH 04/17] Fix cursor query --- .../QKSMS/ui/conversationlist/ConversationListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ae175b64..5296826a 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 @@ -321,7 +321,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage selection.append(" != 0"); selection.append(" AND "); selection.append(Telephony.Threads._ID); - selection.append(" != ("); + selection.append(" NOT IN ("); Set idStrings = mPrefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); Object[] idArray = idStrings.toArray(); From 545ae250c14b9a5669622566f0ff8909d16d7255 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 14 Sep 2015 00:47:42 -0400 Subject: [PATCH 05/17] 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) { From d3c25b8ffcdd5387f9ae471966f5bccc746ad429 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 14 Sep 2015 01:07:21 -0400 Subject: [PATCH 06/17] Created dummy menu item for showing blocked messages in menu --- .../QKSMS/common/BlockedConversationHelper.java | 17 +++++++++++++++++ .../ConversationListFragment.java | 4 +++- QKSMS/src/main/res/menu/coversation_list.xml | 5 +++++ QKSMS/src/main/res/values/strings.xml | 5 +++-- QKSMS/src/main/res/xml/settings_general.xml | 4 ++-- 5 files changed, 30 insertions(+), 5 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 2c606f3f..b60e5862 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java @@ -1,7 +1,10 @@ package com.moez.QKSMS.common; +import android.content.Context; import android.content.SharedPreferences; import android.provider.Telephony; +import android.view.MenuItem; +import com.moez.QKSMS.R; import com.moez.QKSMS.ui.settings.SettingsFragment; import java.util.HashSet; @@ -66,4 +69,18 @@ public class BlockedConversationHelper { return selection.toString(); } + + /** + * 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) { + if (item == null) { + return; + } + + item.setVisible(prefs.getBoolean(SettingsFragment.BLOCKED_ENABLED, false)); + item.setTitle(context.getString(R.string.menu_blocked_conversations, 4)); + + } } 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 2f1fd562..a7b1cff9 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 @@ -139,6 +139,8 @@ public class ConversationListFragment extends QKFragment implements LoaderManage } else { mAdapter.disableMultiSelectMode(false); } + + BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, menu.findItem(R.id.blocked)); } @Override @@ -284,7 +286,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage } private void initLoaderManager() { - getLoaderManager().initLoader(0, null, this); + getLoaderManager().restartLoader(0, null, this); } private void switchFragment(Fragment fragment) { diff --git a/QKSMS/src/main/res/menu/coversation_list.xml b/QKSMS/src/main/res/menu/coversation_list.xml index 37301c79..51850307 100644 --- a/QKSMS/src/main/res/menu/coversation_list.xml +++ b/QKSMS/src/main/res/menu/coversation_list.xml @@ -25,6 +25,11 @@ android:id="@+id/menu_settings" android:title="@string/menu_settings" /> + + diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 5fac3599..c9d3aade 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -164,8 +164,8 @@ Vibrate on message delivery Yappy integration Enable full support for Yappy - Blocked senders - Long-press on a conversation to block messages + Blocked conversations + Long-press on a conversation and block to move to blocked inbox and stop notifications Mobile numbers Only show mobile numbers in contact suggestions Automatic emoji @@ -634,6 +634,7 @@ Unmute conversation Block conversation Unblock conversation + Blocked (%s) 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 4f413e6e..0ca65526 100644 --- a/QKSMS/src/main/res/xml/settings_general.xml +++ b/QKSMS/src/main/res/xml/settings_general.xml @@ -93,8 +93,8 @@ 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:summary="@string/pref_blocked_conversations_summary" + android:title="@string/pref_blocked_conversations" android:widgetLayout="@layout/view_checkbox" /> Date: Thu, 17 Sep 2015 22:21:37 -0400 Subject: [PATCH 07/17] 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 From 87f4d31745d4c9c0802edb0dbd4eca325f8a3012 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 17 Sep 2015 22:28:50 -0400 Subject: [PATCH 08/17] Update title correctly --- QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java | 2 +- .../QKSMS/ui/conversationlist/ConversationListFragment.java | 5 +++++ QKSMS/src/main/res/values/strings.xml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java index 66ca389a..99fe9f41 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -263,7 +263,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.OnOpenListen if (mSlidingMenu.isMenuShowing() || content == null) { getSupportActionBar().setDisplayHomeAsUpEnabled(false); - setTitle(getString(R.string.title_conversation_list)); + setTitle(this.menuFragment.getTitleId()); inflater.inflate(R.menu.coversation_list, menu); } else { 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 191154f6..45134b9b 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 @@ -162,6 +162,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage case R.id.menu_blocked: mShowBlocked = !mShowBlocked; + mContext.setTitle(mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list); BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, mBlockedItem, mShowBlocked); initLoaderManager(); return true; @@ -170,6 +171,10 @@ public class ConversationListFragment extends QKFragment implements LoaderManage return super.onOptionsItemSelected(item); } + public int getTitleId() { + return mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list; + } + @Override public void onItemClick(Conversation conversation, View view) { if (mAdapter.isInMultiSelectMode()) { diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 6bf1ac92..c8199613 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -295,6 +295,7 @@ Compose Conversations + Blocked Changelog From 43a5d443f1cd5f3933e2854a86d5c5c36dde85f2 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 17 Sep 2015 22:48:55 -0400 Subject: [PATCH 09/17] Don't show notifications from blocked contacts --- .../com/moez/QKSMS/common/BlockedConversationHelper.java | 9 +++++++++ .../java/com/moez/QKSMS/receiver/MessagingReceiver.java | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 0c702b87..0103fd57 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java @@ -44,6 +44,15 @@ public class BlockedConversationHelper { prefs.edit().putStringSet(SettingsFragment.BLOCKED_SENDERS, idStrings2).apply(); } + public static Set getBlockedConversationIds(SharedPreferences prefs) { + Set conversations = getBlockedConversations(prefs); + Set ids = new HashSet<>(); + for (String id : conversations) { + ids.add(Long.parseLong(id)); + } + return ids; + } + public static Set getBlockedConversations(SharedPreferences prefs) { return prefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java index e286b771..a77413a6 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java @@ -5,8 +5,10 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.PowerManager; +import android.preference.PreferenceManager; import android.telephony.SmsMessage; import android.util.Log; +import com.moez.QKSMS.common.BlockedConversationHelper; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.data.Message; import com.moez.QKSMS.service.NotificationService; @@ -54,7 +56,8 @@ public class MessagingReceiver extends BroadcastReceiver { Message message = new Message(context, uri); ConversationPrefsHelper prefs = new ConversationPrefsHelper(context, message.getThreadId()); - if (prefs.getNotificationsEnabled()) { + if (prefs.getNotificationsEnabled() && !BlockedConversationHelper.getBlockedConversationIds( + PreferenceManager.getDefaultSharedPreferences(context)).contains(message.getThreadId())) { Intent messageHandlerIntent = new Intent(context, NotificationService.class); messageHandlerIntent.putExtra(NotificationService.EXTRA_POPUP, true); messageHandlerIntent.putExtra(NotificationService.EXTRA_URI, uri.toString()); From 698ca53a6ecffc05d81e229cab4b8f572ba2e220 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 17 Sep 2015 22:54:41 -0400 Subject: [PATCH 10/17] Show better titles in menu --- .../java/com/moez/QKSMS/common/BlockedConversationHelper.java | 4 +--- QKSMS/src/main/res/values/strings.xml | 2 ++ 2 files changed, 3 insertions(+), 3 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 0103fd57..f145e4f5 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java @@ -93,9 +93,7 @@ public class BlockedConversationHelper { * Blocked (#). This method will find the number of blocked unread messages to show in that menu item and bind it */ 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; } @@ -120,7 +118,7 @@ public class BlockedConversationHelper { 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, "...")); + mMenuItem.setTitle(mContext.getString(mShowBlocked ? R.string.menu_messages : R.string.menu_blocked)); } @Override diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index c8199613..0e440f93 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -635,6 +635,8 @@ Unmute conversation Block conversation Unblock conversation + Messages + Blocked Blocked (%s new) Messages (%s new) Notification settings From af023e3086c0f3034666c3e4e10173f9f7c9244f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 17 Sep 2015 23:06:11 -0400 Subject: [PATCH 11/17] Added special back navigation handling for blocked messages --- .../java/com/moez/QKSMS/ui/MainActivity.java | 13 +++++++------ .../ConversationListFragment.java | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java index 99fe9f41..cb202516 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -389,18 +389,19 @@ public class MainActivity extends QKActivity implements SlidingMenu.OnOpenListen public boolean onKeyUp(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { if (!mSlidingMenu.isMenuShowing()) { - Fragment category = getFragmentManager() - .findFragmentByTag(SettingsFragment.CATEGORY_TAG); + Fragment category = getFragmentManager().findFragmentByTag(SettingsFragment.CATEGORY_TAG); if (category != null) { - getFragmentManager().beginTransaction() - .remove(category) - .commit(); + getFragmentManager().beginTransaction().remove(category).commit(); } else { mSlidingMenu.showMenu(); } return true; } else { - finish(); + if (menuFragment.isShowingBlocked()) { + menuFragment.setShowingBlocked(false); + } else { + finish(); + } } } 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 45134b9b..cd811d7f 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 @@ -161,10 +161,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage return true; case R.id.menu_blocked: - mShowBlocked = !mShowBlocked; - mContext.setTitle(mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list); - BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, mBlockedItem, mShowBlocked); - initLoaderManager(); + setShowingBlocked(!mShowBlocked); return true; } @@ -175,6 +172,17 @@ public class ConversationListFragment extends QKFragment implements LoaderManage return mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list; } + public boolean isShowingBlocked() { + return mShowBlocked; + } + + public void setShowingBlocked(boolean showBlocked) { + mShowBlocked = showBlocked; + mContext.setTitle(mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list); + BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, mBlockedItem, mShowBlocked); + initLoaderManager(); + } + @Override public void onItemClick(Conversation conversation, View view) { if (mAdapter.isInMultiSelectMode()) { From 44bd4192f13a4effce363d4e4cfbdc75da500ac5 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 17 Sep 2015 23:08:19 -0400 Subject: [PATCH 12/17] Update list when blocked state changed --- .../QKSMS/ui/conversationlist/ConversationListFragment.java | 2 ++ 1 file changed, 2 insertions(+) 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 cd811d7f..a664f87e 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 @@ -267,10 +267,12 @@ public class ConversationListFragment extends QKFragment implements LoaderManage case MENU_BLOCK_CONVERSATION: BlockedConversationHelper.blockConversation(mPrefs, conversation.getThreadId()); + initLoaderManager(); break; case MENU_UNBLOCK_CONVERSATION: BlockedConversationHelper.unblockConversation(mPrefs, conversation.getThreadId()); + initLoaderManager(); break; case MENU_MARK_READ: From a7b881b057e9e5af02e987f7c1e8cfbe93d9ac81 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 23 Sep 2015 00:52:08 -0400 Subject: [PATCH 13/17] Simplified methods --- .../QKSMS/common/BlockedConversationHelper.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 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 f145e4f5..1a6294a0 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java @@ -25,11 +25,7 @@ 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)); + return (idStrings.contains(String.valueOf(threadId))); } public static void blockConversation(SharedPreferences prefs, long threadId) { @@ -59,12 +55,7 @@ public class BlockedConversationHelper { 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; + return idStrings.toArray(new String[idStrings.size()]); } public static String getCursorSelection(SharedPreferences prefs, boolean blocked) { From 4f31f33aef844ef07096d37b337118234e6c3a30 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 23 Sep 2015 01:28:48 -0400 Subject: [PATCH 14/17] Added dialog to block phone numbers before they're received --- .../common/BlockedConversationHelper.java | 27 ++++++++ .../QKSMS/receiver/MessagingReceiver.java | 13 +++- .../QKSMS/ui/dialog/BlockedNumberDialog.java | 64 +++++++++++++++++++ .../QKSMS/ui/settings/SettingsFragment.java | 5 ++ QKSMS/src/main/res/values/strings.xml | 5 ++ QKSMS/src/main/res/xml/settings_general.xml | 7 ++ 6 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.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 index 1a6294a0..985f05e9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java @@ -9,6 +9,7 @@ import android.provider.Telephony; import android.util.Log; import android.view.MenuItem; import com.moez.QKSMS.R; +import com.moez.QKSMS.common.utils.PhoneNumberUtils; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.data.Message; import com.moez.QKSMS.transaction.SmsHelper; @@ -53,6 +54,32 @@ public class BlockedConversationHelper { return prefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); } + public static void blockFutureConversation(SharedPreferences prefs, String address) { + Set idStrings = prefs.getStringSet(SettingsFragment.BLOCKED_FUTURE, new HashSet()); + idStrings.add(address); + prefs.edit().putStringSet(SettingsFragment.BLOCKED_FUTURE, idStrings).apply(); + } + + public static void unblockFutureConversation(SharedPreferences prefs, String address) { + Set idStrings2 = prefs.getStringSet(SettingsFragment.BLOCKED_FUTURE, new HashSet()); + idStrings2.remove(address); + prefs.edit().putStringSet(SettingsFragment.BLOCKED_FUTURE, idStrings2).apply(); + } + + public static Set getFutureBlockedConversations(SharedPreferences prefs) { + return prefs.getStringSet(SettingsFragment.BLOCKED_FUTURE, new HashSet()); + } + + public static boolean isFutureBlocked(SharedPreferences prefs, String address) { + for (String s : getFutureBlockedConversations(prefs)) { + if (PhoneNumberUtils.compareLoosely(s, address)) { + return true; + } + } + + return false; + } + public static String[] getBlockedConversationArray(SharedPreferences prefs) { Set idStrings = getBlockedConversations(prefs); return idStrings.toArray(new String[idStrings.size()]); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java index a77413a6..25fb08db 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java @@ -3,6 +3,7 @@ package com.moez.QKSMS.receiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.net.Uri; import android.os.PowerManager; import android.preference.PreferenceManager; @@ -54,9 +55,15 @@ public class MessagingReceiver extends BroadcastReceiver { uri = SmsHelper.addMessageToInbox(context, address, body, date); Message message = new Message(context, uri); - ConversationPrefsHelper prefs = new ConversationPrefsHelper(context, message.getThreadId()); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(context, message.getThreadId()); - if (prefs.getNotificationsEnabled() && !BlockedConversationHelper.getBlockedConversationIds( + if (BlockedConversationHelper.isFutureBlocked(prefs, address)) { + BlockedConversationHelper.unblockFutureConversation(prefs, address); + BlockedConversationHelper.blockConversation(prefs, message.getThreadId()); + message.markSeen(); + + } else if (conversationPrefs.getNotificationsEnabled() && !BlockedConversationHelper.getBlockedConversationIds( PreferenceManager.getDefaultSharedPreferences(context)).contains(message.getThreadId())) { Intent messageHandlerIntent = new Intent(context, NotificationService.class); messageHandlerIntent.putExtra(NotificationService.EXTRA_POPUP, true); @@ -69,7 +76,7 @@ public class MessagingReceiver extends BroadcastReceiver { message.markSeen(); } - if (prefs.getWakePhoneEnabled()) { + if (conversationPrefs.getWakePhoneEnabled()) { PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager.WakeLock wakeLock = pm.newWakeLock((PowerManager.SCREEN_DIM_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP), "MessagingReceiver"); wakeLock.acquire(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.java new file mode 100644 index 00000000..93d1729a --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.java @@ -0,0 +1,64 @@ +package com.moez.QKSMS.ui.dialog; + +import android.content.SharedPreferences; +import android.preference.PreferenceManager; +import android.view.View; +import android.widget.AdapterView; +import android.widget.TextView; +import com.moez.QKSMS.R; +import com.moez.QKSMS.common.BlockedConversationHelper; +import com.moez.QKSMS.ui.base.QKActivity; +import com.moez.QKSMS.ui.view.QKEditText; + +import java.util.Set; + +public class BlockedNumberDialog { + + public static void showDialog(final QKActivity context) { + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + Set addresses = BlockedConversationHelper.getFutureBlockedConversations(prefs); + + new QKDialog() + .setContext(context) + .setTitle(R.string.pref_block_future) + .setItems(addresses.toArray(new String[addresses.size()]), new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, final View view, int position, long id) { + new QKDialog() + .setContext(context) + .setTitle(R.string.title_unblock_address) + .setMessage(((TextView) view).getText().toString()) + .setPositiveButton(R.string.yes, new View.OnClickListener() { + @Override + public void onClick(View v) { + BlockedConversationHelper.unblockFutureConversation(prefs, ((TextView) view).getText().toString()); + } + }) + .setNegativeButton(R.string.cancel, null) + .show(context.getFragmentManager(), "remove from future blocked"); + } + }) + .setPositiveButton(R.string.add, new View.OnClickListener() { + @Override + public void onClick(View v) { + final QKEditText editText = new QKEditText(context); + new QKDialog() + .setContext(context) + .setTitle(R.string.title_block_address) + .setCustomView(editText) + .setPositiveButton(R.string.add, new View.OnClickListener() { + @Override + public void onClick(View v) { + if (editText.getText().length() > 0) { + BlockedConversationHelper.blockFutureConversation(prefs, editText.getText().toString()); + } + } + }) + .setNegativeButton(R.string.cancel, null) + .show(context.getFragmentManager(), "add to future blocked"); + } + }) + .setNegativeButton(R.string.cancel, null) + .show(context.getFragmentManager(), "future blocked conversations"); + } +} 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 1c279e4a..2105102f 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 @@ -35,6 +35,7 @@ import android.widget.Toast; import com.mariussoft.endlessjabber.sdk.EndlessJabberInterface; import com.moez.QKSMS.R; import com.moez.QKSMS.common.AnalyticsManager; +import com.moez.QKSMS.ui.dialog.BlockedNumberDialog; import com.moez.QKSMS.ui.dialog.BubblePreferenceDialog; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.receiver.NightModeAutoReceiver; @@ -113,6 +114,7 @@ public class SettingsFragment extends PreferenceFragment implements 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 BLOCKED_FUTURE = "pref_key_block_future"; 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"; @@ -551,6 +553,9 @@ public class SettingsFragment extends PreferenceFragment implements case ICON: ThemeManager.setIcon(mContext); break; + case BLOCKED_FUTURE: + BlockedNumberDialog.showDialog(mContext); + break; case NOTIFICATION_LED_COLOR: mLedColorPickerDialog.show(getActivity().getFragmentManager(), "colorpicker"); break; diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 0e440f93..f9b4ec04 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -166,6 +166,8 @@ Enable full support for Yappy Blocked conversations Long-press on a conversation and block to move to blocked inbox and stop notifications + Block future messages + Add additional phone numbers to block Mobile numbers Only show mobile numbers in contact suggestions Automatic emoji @@ -304,6 +306,8 @@ Donate QK Responses + Block number + Unblock number Yes + Add Save diff --git a/QKSMS/src/main/res/xml/settings_general.xml b/QKSMS/src/main/res/xml/settings_general.xml index 0ca65526..a65ceac4 100644 --- a/QKSMS/src/main/res/xml/settings_general.xml +++ b/QKSMS/src/main/res/xml/settings_general.xml @@ -96,6 +96,13 @@ android:summary="@string/pref_blocked_conversations_summary" android:title="@string/pref_blocked_conversations" android:widgetLayout="@layout/view_checkbox" /> + Date: Sun, 18 Oct 2015 22:38:56 -0400 Subject: [PATCH 15/17] Merge `master` into `block`senders` --- QKSMS/build.gradle | 2 + .../QKSMS/common/utils/DateFormatterTest.java | 13 +- .../java/android/annotation/SdkConstant.java | 2 +- .../android/location/CountryDetector.java | 2 +- .../java/android/net/DhcpInfoInternal.java | 2 +- .../android/net/IConnectivityManager.java | 2 +- .../android/net/INetworkPolicyListener.java | 2 +- .../android/net/INetworkPolicyManager.java | 2 +- .../java/android/net/LinkCapabilities.java | 8 +- .../main/java/android/net/LinkProperties.java | 27 ++- .../main/java/android/net/NetworkPolicy.java | 12 +- .../java/android/net/ProxyProperties.java | 3 +- .../android/mms/dom/smil/ElementTimeImpl.java | 14 +- .../mms/dom/smil/SmilDocumentImpl.java | 45 ++-- .../mms/dom/smil/SmilParElementImpl.java | 2 +- .../com/android/mms/dom/smil/SmilPlayer.java | 14 +- .../sdk/EndlessJabberInterface.java | 4 +- .../sdk/EndlessJabberWakefulService.java | 109 ++++----- .../QKSMS/common/ConversationPrefsHelper.java | 4 + .../com/moez/QKSMS/common/FontManager.java | 8 +- .../moez/QKSMS/common/LiveViewManager.java | 7 +- .../com/moez/QKSMS/common/QKRateSnack.java | 24 ++ .../QKSMS/common/emoji/EmojiRegistry.java | 45 ++-- .../com/moez/QKSMS/common/emoji/Emojis.java | 3 + .../QKSMS/common/formatter/Formatter.java | 5 + .../common/formatter/FormatterFactory.java | 12 + .../formatter/NumberToContactFormatter.java | 43 ++++ .../QKSMS/common/google/CacheManager.java | 2 +- .../common/google/ImageCacheService.java | 4 +- .../QKSMS/common/google/ThumbnailManager.java | 2 +- .../QKSMS/common/utils/DateFormatter.java | 7 +- .../java/com/moez/QKSMS/data/Contact.java | 5 + .../com/moez/QKSMS/data/ContactHelper.java | 6 +- .../java/com/moez/QKSMS/data/Message.java | 13 +- .../com/moez/QKSMS/exif/ExifInterface.java | 6 +- .../com/moez/QKSMS/receiver/BootReceiver.java | 4 +- .../QKSMS/receiver/DeliveredReceiver.java | 7 +- .../QKSMS/receiver/NightModeAutoReceiver.java | 4 +- .../QKSMS/service/NotificationService.java | 13 +- .../transaction/NotificationManager.java | 9 +- .../com/moez/QKSMS/transaction/SmsHelper.java | 6 +- .../com/moez/QKSMS/ui/ContentFragment.java | 39 ++++ .../java/com/moez/QKSMS/ui/MainActivity.java | 216 ++++++++---------- .../java/com/moez/QKSMS/ui/ThemeManager.java | 5 +- .../moez/QKSMS/ui/base/ClickyViewHolder.java | 18 +- .../com/moez/QKSMS/ui/base/QKActivity.java | 26 ++- .../moez/QKSMS/ui/base/QKContentFragment.java | 134 +---------- .../com/moez/QKSMS/ui/base/QKFragment.java | 25 +- .../QKSMS/ui/base/RecyclerCursorAdapter.java | 7 +- .../QKSMS/ui/compose/ComposeFragment.java | 35 +-- .../ConversationListAdapter.java | 18 +- .../ConversationListFragment.java | 12 +- .../ConversationListViewHolder.java | 31 +-- .../ui/delivery/DeliveryReportHelper.java | 10 +- .../com/moez/QKSMS/ui/dialog/QKDialog.java | 4 +- .../QKSMS/ui/dialog/mms/MMSSetupFragment.java | 46 ++-- .../QKSMS/ui/dialog/mms/QKDialogFragment.java | 2 +- .../QKSMS/ui/messagelist/MessageItem.java | 5 +- .../ui/messagelist/MessageListAdapter.java | 22 +- .../ui/messagelist/MessageListFragment.java | 43 ++-- .../ui/messagelist/MessageListViewHolder.java | 11 +- .../moez/QKSMS/ui/mms/SlideshowActivity.java | 2 +- .../moez/QKSMS/ui/search/SearchAdapter.java | 13 +- .../moez/QKSMS/ui/search/SearchFragment.java | 23 +- .../QKSMS/ui/search/SearchViewHolder.java | 5 +- .../QKSMS/ui/settings/SettingsFragment.java | 143 +++++------- .../QKSMS/ui/settings/TimePickerFragment.java | 71 ++++++ .../ui/view/AutoCompleteContactView.java | 12 +- .../com/moez/QKSMS/ui/view/ComposeView.java | 40 ++-- .../com/moez/QKSMS/ui/view/QKTextView.java | 6 +- .../QKSMS/ui/view/StarredContactsView.java | 10 +- .../welcome/DemoConversationCursorLoader.java | 2 +- .../QKSMS/ui/welcome/WelcomeActivity.java | 2 +- .../ui/welcome/WelcomeNightFragment.java | 5 + .../moez/QKSMS/ui/widget/WidgetProvider.java | 42 +++- .../moez/QKSMS/ui/widget/WidgetService.java | 14 +- QKSMS/src/main/res/values-de/strings.xml | 2 + QKSMS/src/main/res/values/donottranslate.xml | 3 + QKSMS/src/main/res/values/strings.xml | 6 + QKSMS/src/main/res/xml/settings.xml | 3 + .../main/res/xml/settings_notifications.xml | 8 + QKSMS/src/main/res/xml/widget_info.xml | 4 +- README.md | 22 +- 83 files changed, 891 insertions(+), 760 deletions(-) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/QKRateSnack.java create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/formatter/Formatter.java create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/formatter/FormatterFactory.java create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/formatter/NumberToContactFormatter.java create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/ContentFragment.java create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/settings/TimePickerFragment.java diff --git a/QKSMS/build.gradle b/QKSMS/build.gradle index 8e7b8df4..9863ba37 100644 --- a/QKSMS/build.gradle +++ b/QKSMS/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'com.android.application' repositories { mavenCentral() + jcenter() } android { @@ -74,6 +75,7 @@ dependencies { compile 'com.googlecode.ez-vcard:ez-vcard:0.9.6' compile 'com.google.code.gson:gson:2.3' compile 'com.koushikdutta.ion:ion:1.1.7' + compile 'org.ligi:snackengage:0.4' // Google libraries compile 'com.android.support:appcompat-v7:22.2.1' diff --git a/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java b/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java index 95f1aa8c..6fc42a99 100644 --- a/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java +++ b/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java @@ -1,25 +1,22 @@ package com.moez.QKSMS.common.utils; import android.content.SharedPreferences; +import android.preference.PreferenceManager; import android.test.AndroidTestCase; -import android.util.Log; - -import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.settings.SettingsFragment; import java.text.SimpleDateFormat; -import java.util.Locale; public class DateFormatterTest extends AndroidTestCase { protected void setUp() throws Exception { super.setUp(); } - public void test24Hours(){ - SharedPreferences prefs = MainActivity.getPrefs(getContext()); - prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, true).commit(); + public void test24Hours() { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, true).apply(); assertTrue(DateFormatter.accountFor24HourTime(getContext(), new SimpleDateFormat("h:mm a")).equals(new SimpleDateFormat("H:mm"))); - prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, false).commit(); + prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, false).apply(); } public void testDateSymbolsAPI(){ diff --git a/QKSMS/src/main/java/android/annotation/SdkConstant.java b/QKSMS/src/main/java/android/annotation/SdkConstant.java index fb97a27c..8fcefb57 100644 --- a/QKSMS/src/main/java/android/annotation/SdkConstant.java +++ b/QKSMS/src/main/java/android/annotation/SdkConstant.java @@ -29,7 +29,7 @@ import java.lang.annotation.Target; @Target({ElementType.FIELD}) @Retention(RetentionPolicy.SOURCE) public @interface SdkConstant { - public static enum SdkConstantType { + public enum SdkConstantType { ACTIVITY_INTENT_ACTION, BROADCAST_INTENT_ACTION, SERVICE_ACTION, INTENT_CATEGORY, FEATURE } diff --git a/QKSMS/src/main/java/android/location/CountryDetector.java b/QKSMS/src/main/java/android/location/CountryDetector.java index 4ea6e9c6..a90a3185 100644 --- a/QKSMS/src/main/java/android/location/CountryDetector.java +++ b/QKSMS/src/main/java/android/location/CountryDetector.java @@ -90,7 +90,7 @@ public class CountryDetector { */ public CountryDetector(ICountryDetector service) { mService = service; - mListeners = new HashMap(); + mListeners = new HashMap<>(); } /** diff --git a/QKSMS/src/main/java/android/net/DhcpInfoInternal.java b/QKSMS/src/main/java/android/net/DhcpInfoInternal.java index f4d7b2a6..8e4e6da5 100644 --- a/QKSMS/src/main/java/android/net/DhcpInfoInternal.java +++ b/QKSMS/src/main/java/android/net/DhcpInfoInternal.java @@ -53,7 +53,7 @@ public class DhcpInfoInternal { private Collection mRoutes; public DhcpInfoInternal() { - mRoutes = new ArrayList(); + mRoutes = new ArrayList<>(); } public void addRoute(RouteInfo routeInfo) { diff --git a/QKSMS/src/main/java/android/net/IConnectivityManager.java b/QKSMS/src/main/java/android/net/IConnectivityManager.java index a98252cd..7203366a 100644 --- a/QKSMS/src/main/java/android/net/IConnectivityManager.java +++ b/QKSMS/src/main/java/android/net/IConnectivityManager.java @@ -1387,7 +1387,7 @@ public interface IConnectivityManager extends android.os.IInterface { } } - static final int TRANSACTION_setNetworkPreference = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0); + static final int TRANSACTION_setNetworkPreference = (android.os.IBinder.FIRST_CALL_TRANSACTION); static final int TRANSACTION_getNetworkPreference = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1); static final int TRANSACTION_getActiveNetworkInfo = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2); static final int TRANSACTION_getActiveNetworkInfoForUid = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3); diff --git a/QKSMS/src/main/java/android/net/INetworkPolicyListener.java b/QKSMS/src/main/java/android/net/INetworkPolicyListener.java index 4404103d..a8b331e1 100644 --- a/QKSMS/src/main/java/android/net/INetworkPolicyListener.java +++ b/QKSMS/src/main/java/android/net/INetworkPolicyListener.java @@ -125,7 +125,7 @@ public interface INetworkPolicyListener extends android.os.IInterface { } } - static final int TRANSACTION_onUidRulesChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0); + static final int TRANSACTION_onUidRulesChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION); static final int TRANSACTION_onMeteredIfacesChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1); static final int TRANSACTION_onRestrictBackgroundChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2); } diff --git a/QKSMS/src/main/java/android/net/INetworkPolicyManager.java b/QKSMS/src/main/java/android/net/INetworkPolicyManager.java index 154ce17e..06134524 100644 --- a/QKSMS/src/main/java/android/net/INetworkPolicyManager.java +++ b/QKSMS/src/main/java/android/net/INetworkPolicyManager.java @@ -439,7 +439,7 @@ public interface INetworkPolicyManager extends android.os.IInterface { } } - static final int TRANSACTION_setUidPolicy = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0); + static final int TRANSACTION_setUidPolicy = (android.os.IBinder.FIRST_CALL_TRANSACTION); static final int TRANSACTION_getUidPolicy = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1); static final int TRANSACTION_getUidsWithPolicy = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2); static final int TRANSACTION_isUidForeground = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3); diff --git a/QKSMS/src/main/java/android/net/LinkCapabilities.java b/QKSMS/src/main/java/android/net/LinkCapabilities.java index 58ad1593..c4e20cb9 100644 --- a/QKSMS/src/main/java/android/net/LinkCapabilities.java +++ b/QKSMS/src/main/java/android/net/LinkCapabilities.java @@ -199,7 +199,7 @@ public class LinkCapabilities implements Parcelable { * Constructor */ public LinkCapabilities() { - mCapabilities = new HashMap(); + mCapabilities = new HashMap<>(); } /** @@ -209,9 +209,9 @@ public class LinkCapabilities implements Parcelable { */ public LinkCapabilities(LinkCapabilities source) { if (source != null) { - mCapabilities = new HashMap(source.mCapabilities); + mCapabilities = new HashMap<>(source.mCapabilities); } else { - mCapabilities = new HashMap(); + mCapabilities = new HashMap<>(); } } @@ -356,7 +356,7 @@ public class LinkCapabilities implements Parcelable { public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mCapabilities.size()); for (Entry entry : mCapabilities.entrySet()) { - dest.writeInt(entry.getKey().intValue()); + dest.writeInt(entry.getKey()); dest.writeString(entry.getValue()); } } diff --git a/QKSMS/src/main/java/android/net/LinkProperties.java b/QKSMS/src/main/java/android/net/LinkProperties.java index 87842c7b..bc0ec65d 100644 --- a/QKSMS/src/main/java/android/net/LinkProperties.java +++ b/QKSMS/src/main/java/android/net/LinkProperties.java @@ -52,14 +52,14 @@ import java.util.Collections; public class LinkProperties implements Parcelable { String mIfaceName; - private Collection mLinkAddresses = new ArrayList(); - private Collection mDnses = new ArrayList(); - private Collection mRoutes = new ArrayList(); + private Collection mLinkAddresses = new ArrayList<>(); + private Collection mDnses = new ArrayList<>(); + private Collection mRoutes = new ArrayList<>(); private ProxyProperties mHttpProxy; public static class CompareResult { - public Collection removed = new ArrayList(); - public Collection added = new ArrayList(); + public Collection removed = new ArrayList<>(); + public Collection added = new ArrayList<>(); @Override public String toString() { @@ -97,7 +97,7 @@ public class LinkProperties implements Parcelable { } public Collection getAddresses() { - Collection addresses = new ArrayList(); + Collection addresses = new ArrayList<>(); for (LinkAddress linkAddress : mLinkAddresses) { addresses.add(linkAddress.getAddress()); } @@ -192,8 +192,7 @@ public class LinkProperties implements Parcelable { public boolean isIdenticalAddresses(LinkProperties target) { Collection targetAddresses = target.getAddresses(); Collection sourceAddresses = getAddresses(); - return (sourceAddresses.size() == targetAddresses.size()) ? - sourceAddresses.containsAll(targetAddresses) : false; + return (sourceAddresses.size() == targetAddresses.size()) && sourceAddresses.containsAll(targetAddresses); } /** @@ -275,8 +274,8 @@ public class LinkProperties implements Parcelable { * are in target but not in mLinkAddresses are placed in the * addedAddresses. */ - CompareResult result = new CompareResult(); - result.removed = new ArrayList(mLinkAddresses); + CompareResult result = new CompareResult<>(); + result.removed = new ArrayList<>(mLinkAddresses); result.added.clear(); if (target != null) { for (LinkAddress newAddress : target.getLinkAddresses()) { @@ -305,9 +304,9 @@ public class LinkProperties implements Parcelable { * are in target but not in mDnses are placed in the * addedAddresses. */ - CompareResult result = new CompareResult(); + CompareResult result = new CompareResult<>(); - result.removed = new ArrayList(mDnses); + result.removed = new ArrayList<>(mDnses); result.added.clear(); if (target != null) { for (InetAddress newAddress : target.getDnses()) { @@ -335,9 +334,9 @@ public class LinkProperties implements Parcelable { * leaving the routes that are different. And route address which * are in target but not in mRoutes are placed in added. */ - CompareResult result = new CompareResult(); + CompareResult result = new CompareResult<>(); - result.removed = new ArrayList(mRoutes); + result.removed = new ArrayList<>(mRoutes); result.added.clear(); if (target != null) { for (RouteInfo r : target.getRoutes()) { diff --git a/QKSMS/src/main/java/android/net/NetworkPolicy.java b/QKSMS/src/main/java/android/net/NetworkPolicy.java index b718d52c..9d46b797 100644 --- a/QKSMS/src/main/java/android/net/NetworkPolicy.java +++ b/QKSMS/src/main/java/android/net/NetworkPolicy.java @@ -168,17 +168,7 @@ public class NetworkPolicy implements Parcelable, Comparable { @Override public String toString() { - final StringBuilder builder = new StringBuilder("NetworkPolicy"); - builder.append("[").append(template).append("]:"); - builder.append(" cycleDay=").append(cycleDay); - builder.append(", cycleTimezone=").append(cycleTimezone); - builder.append(", warningBytes=").append(warningBytes); - builder.append(", limitBytes=").append(limitBytes); - builder.append(", lastWarningSnooze=").append(lastWarningSnooze); - builder.append(", lastLimitSnooze=").append(lastLimitSnooze); - builder.append(", metered=").append(metered); - builder.append(", inferred=").append(inferred); - return builder.toString(); + return "NetworkPolicy" + "[" + template + "]:" + " cycleDay=" + cycleDay + ", cycleTimezone=" + cycleTimezone + ", warningBytes=" + warningBytes + ", limitBytes=" + limitBytes + ", lastWarningSnooze=" + lastWarningSnooze + ", lastLimitSnooze=" + lastLimitSnooze + ", metered=" + metered + ", inferred=" + inferred; } public static final Creator CREATOR = new Creator() { diff --git a/QKSMS/src/main/java/android/net/ProxyProperties.java b/QKSMS/src/main/java/android/net/ProxyProperties.java index 6a1e83fe..962a46c9 100644 --- a/QKSMS/src/main/java/android/net/ProxyProperties.java +++ b/QKSMS/src/main/java/android/net/ProxyProperties.java @@ -153,8 +153,7 @@ public class ProxyProperties implements Parcelable { return false; } if (mHost != null && p.mHost == null) return false; - if (mHost == null && p.mHost != null) return false; - return mPort == p.mPort; + return !(mHost == null && p.mHost != null) && mPort == p.mPort; } /** diff --git a/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java b/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java index 80dc5615..a3443cd8 100644 --- a/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java +++ b/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java @@ -72,11 +72,11 @@ public abstract class ElementTimeImpl implements ElementTime { String[] beginTimeStringList = mSmilElement.getAttribute("begin").split(";"); // TODO: Check other constraints on parsed values, e.g., "single, non-negative offset values - ArrayList \ No newline at end of file diff --git a/QKSMS/src/main/res/xml/widget_info.xml b/QKSMS/src/main/res/xml/widget_info.xml index d8536d58..4121b658 100644 --- a/QKSMS/src/main/res/xml/widget_info.xml +++ b/QKSMS/src/main/res/xml/widget_info.xml @@ -1,8 +1,8 @@ Date: Sun, 18 Oct 2015 22:56:53 -0400 Subject: [PATCH 16/17] Updated method of setting menu items based on master --- .../main/java/com/moez/QKSMS/ui/MainActivity.java | 3 +-- .../conversationlist/ConversationListFragment.java | 13 ++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java index d28833b6..fb93735e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -263,8 +263,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.OnOpenListen if (mSlidingMenu.isMenuShowing() || mContent == null) { showBackButton(false); - setTitle(mConversationList.getTitleId()); - inflater.inflate(R.menu.coversation_list, menu); + mConversationList.inflateToolbar(menu, inflater, this); } else { showBackButton(true); mContent.inflateToolbar(menu, inflater, this); 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 a9a70465..5a93bdc6 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 @@ -2,6 +2,7 @@ package com.moez.QKSMS.ui.conversationlist; import android.app.Fragment; import android.app.LoaderManager; +import android.content.Context; import android.content.CursorLoader; import android.content.Loader; import android.content.SharedPreferences; @@ -121,9 +122,9 @@ public class ConversationListFragment extends QKFragment implements LoaderManage return view; } - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - super.onCreateOptionsMenu(menu, inflater); + public void inflateToolbar(Menu menu, MenuInflater inflater, Context context) { + inflater.inflate(R.menu.coversation_list, menu); + mContext.setTitle(mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list); // Make sure we're only touching the conversation menu if (menu.findItem(R.id.menu_search) != null) { @@ -142,6 +143,8 @@ public class ConversationListFragment extends QKFragment implements LoaderManage mBlockedItem = menu.findItem(R.id.menu_blocked); BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, mBlockedItem, mShowBlocked); + + super.onCreateOptionsMenu(menu, inflater); } @Override @@ -166,10 +169,6 @@ public class ConversationListFragment extends QKFragment implements LoaderManage return super.onOptionsItemSelected(item); } - public int getTitleId() { - return mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list; - } - public boolean isShowingBlocked() { return mShowBlocked; } From ab5843b75f7affa5fd55eb567d96205bda87589f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 21 Oct 2015 22:03:42 -0400 Subject: [PATCH 17/17] Rename variable --- .../com/moez/QKSMS/common/BlockedConversationHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 985f05e9..02964fb0 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java @@ -36,9 +36,9 @@ public class BlockedConversationHelper { } 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(); + Set idStrings = prefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); + idStrings.remove(String.valueOf(threadId)); + prefs.edit().putStringSet(SettingsFragment.BLOCKED_SENDERS, idStrings).apply(); } public static Set getBlockedConversationIds(SharedPreferences prefs) {