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 02964fb0..3678a2a2 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java @@ -17,6 +17,7 @@ import com.moez.QKSMS.ui.messagelist.MessageColumns; import com.moez.QKSMS.ui.settings.SettingsFragment; import java.util.HashSet; +import java.util.Observable; import java.util.Set; /** @@ -169,4 +170,19 @@ public class BlockedConversationHelper { mMenuItem.setTitle(mContext.getString(mShowBlocked ? R.string.menu_unblocked_conversations : R.string.menu_blocked_conversations, integer)); } } + + public static class FutureBlockedConversationObservable extends Observable { + private static FutureBlockedConversationObservable sInstance = new FutureBlockedConversationObservable(); + + public static FutureBlockedConversationObservable getInstance() { + return sInstance; + } + + public void futureBlockedConversationReceived() { + synchronized (this) { + setChanged(); + notifyObservers(); + } + } + } } 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 25fb08db..d3a4f5e0 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java @@ -62,6 +62,7 @@ public class MessagingReceiver extends BroadcastReceiver { BlockedConversationHelper.unblockFutureConversation(prefs, address); BlockedConversationHelper.blockConversation(prefs, message.getThreadId()); message.markSeen(); + BlockedConversationHelper.FutureBlockedConversationObservable.getInstance().futureBlockedConversationReceived(); } else if (conversationPrefs.getNotificationsEnabled() && !BlockedConversationHelper.getBlockedConversationIds( PreferenceManager.getDefaultSharedPreferences(context)).contains(message.getThreadId())) { 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 10e52dcc..6063d3ef 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 @@ -43,9 +43,12 @@ import com.moez.QKSMS.ui.settings.SettingsFragment; import butterknife.Bind; import butterknife.ButterKnife; +import java.util.Observable; +import java.util.Observer; + public class ConversationListFragment extends QKFragment implements LoaderManager.LoaderCallbacks, LiveView, - RecyclerCursorAdapter.ItemClickListener, RecyclerCursorAdapter.MultiSelectListener { + RecyclerCursorAdapter.ItemClickListener, RecyclerCursorAdapter.MultiSelectListener, Observer { private final String TAG = "ConversationList"; @@ -115,6 +118,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage mViewHasLoaded = true; initLoaderManager(); + BlockedConversationHelper.FutureBlockedConversationObservable.getInstance().addObserver(this); return view; } @@ -272,6 +276,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage public void onDestroy() { super.onDestroy(); LiveViewManager.unregisterView(this); + BlockedConversationHelper.FutureBlockedConversationObservable.getInstance().deleteObserver(this); } public Loader onCreateLoader(int id, Bundle args) { @@ -328,4 +333,11 @@ public class ConversationListFragment extends QKFragment implements LoaderManage mContext.invalidateOptionsMenu(); } + /** + * This should be called when there's a future blocked conversation, and it's received + */ + @Override + public void update(Observable observable, Object data) { + initLoaderManager(); + } }