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" />