aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-07-20 23:18:29 +0200
committerChristian S <christian@pix-art.de>2015-07-20 23:18:29 +0200
commitcdb4ae69eada7176d3faa0a8e9bc07a4e2da3473 (patch)
tree066721d8c11357d519d4f83e51aec60da7722ead /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
parentdb96dd689b185e12c19a3a64dc9081c098247d44 (diff)
move typing info to ActionBar subtitle
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 587e923aa..350b63e50 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -978,12 +978,13 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
protected void updateStatusMessages() {
synchronized (this.messageList) {
if (conversation.getMode() == Conversation.MODE_SINGLE) {
+ /*
ChatState state = conversation.getIncomingChatState();
if (state == ChatState.COMPOSING) {
this.messageList.add(Message.createStatusMessage(conversation, getString(R.string.contact_is_typing, conversation.getName())));
} else if (state == ChatState.PAUSED) {
this.messageList.add(Message.createStatusMessage(conversation, getString(R.string.contact_has_stopped_typing, conversation.getName())));
- } else {
+ } else { */
for (int i = this.messageList.size() - 1; i >= 0; --i) {
if (this.messageList.get(i).getStatus() == Message.STATUS_RECEIVED) {
return;
@@ -995,7 +996,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
}
}
}
- }
+ //}
}
}
}