aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-08-25 17:30:44 +0200
committerChristian Schneppe <christian@pix-art.de>2016-08-26 20:16:45 +0200
commit656eca50676e82daf6395b3341c028d7525badc5 (patch)
tree8e352631c3fa3a6c7fccf90f7517db4865b7a2bd /src/main/java/de/pixart/messenger/ui
parent6fb2f4f2162a2ffaf83c832fc35070cf103c3d92 (diff)
offer quick reply on android N
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java26
1 files changed, 1 insertions, 25 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 1ffa52c3f..66b901ae3 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -373,31 +373,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
} else if (multi && !conversation.getMucOptions().participating()) {
this.mEditMessage.setHint(R.string.you_are_not_participating);
} else {
- switch (conversation.getNextEncryption()) {
- case Message.ENCRYPTION_NONE:
- if (Config.multipleEncryptionChoices()) {
- mEditMessage.setHint(getString(R.string.send_unencrypted_message));
- } else {
- mEditMessage.setHint(getString(R.string.send_message_to_x,conversation.getName()));
- }
- break;
- case Message.ENCRYPTION_OTR:
- mEditMessage.setHint(getString(R.string.send_otr_message));
- break;
- case Message.ENCRYPTION_AXOLOTL:
- AxolotlService axolotlService = conversation.getAccount().getAxolotlService();
- if (axolotlService != null && axolotlService.trustedSessionVerified(conversation)) {
- mEditMessage.setHint(getString(R.string.send_omemo_x509_message));
- } else {
- mEditMessage.setHint(getString(R.string.send_omemo_message));
- }
- break;
- case Message.ENCRYPTION_PGP:
- mEditMessage.setHint(getString(R.string.send_pgp_message));
- break;
- default:
- break;
- }
+ this.mEditMessage.setHint(UIHelper.getMessageHint(activity,conversation));
getActivity().invalidateOptionsMenu();
}
}