aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-08-26 20:02:36 +0200
committerChristian S <christian@pix-art.de>2015-08-26 20:02:36 +0200
commit0f0054ef8629a285726a9190a297a43f91494af4 (patch)
treeceb391c2b3f7cf098c0dff988e02dd4be941ac5d /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
parentdfe58eaf341efe988f80faf5dc888900d28aa37a (diff)
parentc4a548ada00f5abd175e28ac1df5204f8bbc092f (diff)
Version 1.6.5
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 49878463b..3adbc8431 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -327,7 +327,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
switch (conversation.getNextEncryption()) {
case Message.ENCRYPTION_NONE:
mEditMessage
- .setHint(getString(R.string.send_plain_text_message));
+ .setHint(getString(R.string.send_unencrypted_message));
break;
case Message.ENCRYPTION_OTR:
mEditMessage.setHint(getString(R.string.send_otr_message));
@@ -662,6 +662,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
this.mEditMessage.setText("");
this.mEditMessage.append(this.conversation.getNextMessage());
this.mEditMessage.setKeyboardListener(this);
+ messageListAdapter.updatePreferences();
this.messagesView.setAdapter(messageListAdapter);
updateMessages();
this.messagesLoaded = true;