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

fixed sender label for empty conversations

This commit is contained in:
Daniel Gultsch 2017-03-07 09:22:42 +01:00
parent 79b2f34685
commit 857c761c68
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/eu/siacs/conversations/entities/Conversation.java
View File

@ -455,6 +455,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
public Message getLatestMessage() { public Message getLatestMessage() {
if (this.messages.size() == 0) { if (this.messages.size() == 0) {
Message message = new Message(this, "", Message.ENCRYPTION_NONE); Message message = new Message(this, "", Message.ENCRYPTION_NONE);
message.setType(Message.TYPE_STATUS);
message.setTime(getCreated()); message.setTime(getCreated());
return message; return message;
} else { } else {

4
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
View File

@ -115,9 +115,11 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
} else { } else {
mSenderName.setVisibility(View.GONE); mSenderName.setVisibility(View.GONE);
} }
} else { } else if (message.getType() != Message.TYPE_STATUS) {
mSenderName.setVisibility(View.VISIBLE); mSenderName.setVisibility(View.VISIBLE);
mSenderName.setText(activity.getString(R.string.me)+':'); mSenderName.setText(activity.getString(R.string.me)+':');
} else {
mSenderName.setVisibility(View.GONE);
} }
} }