From 656eca50676e82daf6395b3341c028d7525badc5 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 25 Aug 2016 17:30:44 +0200 Subject: offer quick reply on android N --- .../pixart/messenger/ui/ConversationFragment.java | 26 +--------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/ConversationFragment.java') 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(); } } -- cgit v1.2.3