From 2f487c794778e305ff3a1adfe010f3234f186f2a Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Wed, 8 Jul 2015 18:14:28 +0200
Subject: Display axolotl chat message hint

---
 src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 3 +++
 src/main/res/values/strings.xml                                   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 1da2b519..cc53bce5 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -324,6 +324,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 				case Message.ENCRYPTION_OTR:
 					mEditMessage.setHint(getString(R.string.send_otr_message));
 					break;
+				case Message.ENCRYPTION_AXOLOTL:
+					mEditMessage.setHint(getString(R.string.send_axolotl_message));
+					break;
 				case Message.ENCRYPTION_PGP:
 					mEditMessage.setHint(getString(R.string.send_pgp_message));
 					break;
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7827161f..cdeff3e8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -80,6 +80,7 @@
 	<string name="choose_presence">Choose presence to contact</string>
 	<string name="send_plain_text_message">Send plain text message</string>
 	<string name="send_otr_message">Send OTR encrypted message</string>
+	<string name="send_axolotl_message">Send Axolotl encrypted message</string>
 	<string name="send_pgp_message">Send OpenPGP encrypted message</string>
 	<string name="your_nick_has_been_changed">Your nickname has been changed</string>
 	<string name="send_unencrypted">Send unencrypted</string>
-- 
cgit v1.2.3