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; }