aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationActivity.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index 32689ca7b..fe38445ea 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -251,12 +251,19 @@ public class ConversationActivity extends XmppActivity implements OnConversation
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.activity_conversations, menu);
+ MenuItem qrCodeScanMenuItem = menu.findItem(R.id.action_scan_qr_code);
+ if (qrCodeScanMenuItem != null) {
+ Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+ boolean visible = getResources().getBoolean(R.bool.show_qr_code_scan)
+ && fragment != null
+ && fragment instanceof ConversationsOverviewFragment;
+ qrCodeScanMenuItem.setVisible(visible);
+ }
return super.onCreateOptionsMenu(menu);
}
@Override
public void onConversationSelected(Conversation conversation) {
- Log.d(Config.LOGTAG, "selected " + conversation.getName());
openConversation(conversation, null);
}