aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-02-27 10:25:31 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-02-27 10:25:31 +0100
commit60ab03afb119a61503f101da91f54f15124f9373 (patch)
tree9899cdde9588b5ed0859f64c5cf789ca677a796a /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
parentc393e6089177f31683c4cecfdb359802de1b5e0c (diff)
changed single_account config into more simple lock_settings
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 7b2565c3..55a12710 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -420,7 +420,7 @@ public class ConversationActivity extends XmppActivity
}
}
}
- return true;
+ return super.onCreateOptionsMenu(menu);
}
protected void selectPresenceToAttachFile(final int attachmentChoice, final int encryption) {