aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu
diff options
context:
space:
mode:
authorChristian S. <kriztan@users.noreply.github.com>2015-08-18 17:22:15 +0200
committerChristian S. <kriztan@users.noreply.github.com>2015-08-18 17:22:15 +0200
commit5d3be343ee9728d10ec46414b2abf5f0a0d49d7f (patch)
treeddf450a1d8338d2a56ae7cbb2c3c1de3e5b7f480 /src/main/java/eu
parentf8b203ffff9810d582d40fcadbfb93662a1c8586 (diff)
parent81aeef7f5826bd28873ee69016aea099baa72442 (diff)
Merge pull request #23 from kriztan/Subtitle
modified strings for subtitle typing info
Diffstat (limited to 'src/main/java/eu')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Conversation.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 3a73f78bf..485e7e95c 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -344,6 +344,19 @@ public class Conversation extends AbstractEntity implements Blockable {
return this.getContact().getDisplayName();
}
}
+
+ public String getParticipants() {
+ if (getMode() == MODE_MULTI) {
+ String generatedName = getMucOptions().createNameFromParticipants();
+ if (generatedName != null) {
+ return generatedName;
+ } else {
+ return null;
+ }
+ } else {
+ return null;
+ }
+ }
public String getParticipants() {
if (getMode() == MODE_MULTI) {