Merge remote-tracking branch 'refs/remotes/siacs/master' into development

1 files changed, 14 insertions, 0 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Presences.java b/src/main/java/eu/siacs/conversations/entities/Presences.java
index 813eda7a9..5fe10de0f 100644
--- a/src/main/java/eu/siacs/conversations/entities/Presences.java
+++ b/src/main/java/eu/siacs/conversations/entities/Presences.java
@@ -1,8 +1,10 @@
 package eu.siacs.conversations.entities;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.List;
 
 import eu.siacs.conversations.xml.Element;
 
@@ -57,4 +59,16 @@ public class Presences {
 			return presences.containsKey(presence);
 		}
 	}
+
+	public List<String> getStatusMessages() {
+		ArrayList<String> messages = new ArrayList<>();
+		synchronized (this.presences) {
+			for(Presence presence : this.presences.values()) {
+				if (presence.message != null && !presence.message.trim().isEmpty()) {
+					messages.add(presence.message.trim());
+				}
+			}
+		}
+		return messages;
+	}
 }