diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-02-28 21:48:09 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-02-28 21:48:09 +0100 |
commit | cd0c6ce48e2ac36d9524908acbbc79690b193d9a (patch) | |
tree | e03621214377147d44a13917485baf16b607a11a /src/main/java/eu/siacs/conversations/entities/ListItem.java | |
parent | 8fb6204288d55f8af16ae47e32fa6c049284cadd (diff) | |
parent | c393e6089177f31683c4cecfdb359802de1b5e0c (diff) |
Merge tag '1.10.1' into trz/merge_1.10.1
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/entities/ListItem.java
src/main/java/eu/siacs/conversations/parser/MessageParser.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
src/main/res/menu/message_context.xml
src/main/res/xml/preferences.xml
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/ListItem.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/ListItem.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/ListItem.java b/src/main/java/eu/siacs/conversations/entities/ListItem.java index aba2aef2..56804fbf 100644 --- a/src/main/java/eu/siacs/conversations/entities/ListItem.java +++ b/src/main/java/eu/siacs/conversations/entities/ListItem.java @@ -5,15 +5,17 @@ import java.util.List; import eu.siacs.conversations.xmpp.jid.Jid; public interface ListItem extends Comparable<ListItem> { - public String getDisplayName(); + String getDisplayName(); - public Jid getJid(); + String getDisplayJid(); - public List<Tag> getTags(); + Jid getJid(); public int getStatusColor(); - public final class Tag { + List<Tag> getTags(); + + final class Tag { private final String name; private final int color; @@ -31,5 +33,5 @@ public interface ListItem extends Comparable<ListItem> { } } - public boolean match(final String needle); + boolean match(final String needle); } |