sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Display axolotl chat message hint

This commit is contained in:
Andreas Straub 2015-07-08 18:14:28 +02:00
parent f1d73b9d4e
commit 2628662a7f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -325,6 +325,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case Message.ENCRYPTION_OTR: case Message.ENCRYPTION_OTR:
mEditMessage.setHint(getString(R.string.send_otr_message)); mEditMessage.setHint(getString(R.string.send_otr_message));
break; break;
case Message.ENCRYPTION_AXOLOTL:
mEditMessage.setHint(getString(R.string.send_axolotl_message));
break;
case Message.ENCRYPTION_PGP: case Message.ENCRYPTION_PGP:
mEditMessage.setHint(getString(R.string.send_pgp_message)); mEditMessage.setHint(getString(R.string.send_pgp_message));
break; break;

1
src/main/res/values/strings.xml
View File

@ -80,6 +80,7 @@
<string name="choose_presence">Choose presence to contact</string> <string name="choose_presence">Choose presence to contact</string>
<string name="send_plain_text_message">Send plain text message</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_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="send_pgp_message">Send OpenPGP encrypted message</string>
<string name="your_nick_has_been_changed">Your nickname has been changed</string> <string name="your_nick_has_been_changed">Your nickname has been changed</string>
<string name="send_unencrypted">Send unencrypted</string> <string name="send_unencrypted">Send unencrypted</string>