Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4

Conflicts:
	README.md
	art/render.rb
	build.gradle
	src/main/java/eu/siacs/conversations/Config.java
	src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
	src/main/java/eu/siacs/conversations/entities/Bookmark.java
	src/main/java/eu/siacs/conversations/entities/Contact.java
	src/main/java/eu/siacs/conversations/entities/ListItem.java
	src/main/java/eu/siacs/conversations/entities/Message.java
	src/main/java/eu/siacs/conversations/parser/IqParser.java
	src/main/java/eu/siacs/conversations/parser/PresenceParser.java
	src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
	src/main/java/eu/siacs/conversations/persistance/FileBackend.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
	src/main/java/eu/siacs/conversations/utils/DNSHelper.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
	src/main/res/layout/activity_contact_details.xml
	src/main/res/layout/message_received.xml
	src/main/res/layout/message_sent.xml
	src/main/res/values-bg/strings.xml
	src/main/res/values-de/strings.xml
	src/main/res/values-es/strings.xml
	src/main/res/values-eu/strings.xml
	src/main/res/values-fr/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pt-rBR/strings.xml
	src/main/res/values-pt/strings.xml
	src/main/res/values-ro-rRO/strings.xml
	src/main/res/values-sr/strings.xml
	src/main/res/values-sv/strings.xml
	src/main/res/values-tr-rTR/strings.xml

1 files changed, 36 insertions, 23 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Presence.java b/src/main/java/eu/siacs/conversations/entities/Presence.java
index 442f1bca..e9f6d0d1 100644
--- a/src/main/java/eu/siacs/conversations/entities/Presence.java
+++ b/src/main/java/eu/siacs/conversations/entities/Presence.java
@@ -17,41 +17,46 @@ public class Presence implements Comparable {
 				case XA:   return "xa";
 				case DND:  return "dnd";
 			}
-
 			return null;
 		}
+
+		public static Status fromShowString(String show) {
+			if (show == null) {
+				return ONLINE;
+			} else {
+				switch (show.toLowerCase(Locale.US)) {
+					case "away":
+						return AWAY;
+					case "xa":
+						return XA;
+					case "dnd":
+						return DND;
+					case "chat":
+						return CHAT;
+					default:
+						return ONLINE;
+				}
+			}
+		}
 	}
 
-	protected final Status status;
-	protected ServiceDiscoveryResult disco;
-	protected final String ver;
-	protected final String hash;
+	private final Status status;
+	private ServiceDiscoveryResult disco;
+	private final String ver;
+	private final String hash;
+	private final String message;
 
-	private Presence(Status status, String ver, String hash) {
+	private Presence(Status status, String ver, String hash, String message) {
 		this.status = status;
 		this.ver = ver;
 		this.hash = hash;
+		this.message = message;
 	}
 
-	public static Presence parse(String show, Element caps) {
+	public static Presence parse(String show, Element caps, String message) {
 		final String hash = caps == null ? null : caps.getAttribute("hash");
 		final String ver = caps == null ? null : caps.getAttribute("ver");
-		if (show == null) {
-			return new Presence(Status.ONLINE, ver, hash);
-		} else {
-			switch (show.toLowerCase(Locale.US)) {
-				case "away":
-					return new Presence(Status.AWAY, ver, hash);
-				case "xa":
-					return new Presence(Status.XA, ver, hash);
-				case "dnd":
-					return new Presence(Status.DND, ver, hash);
-				case "chat":
-					return new Presence(Status.CHAT, ver, hash);
-				default:
-					return new Presence(Status.ONLINE, ver, hash);
-			}
-		}
+		return new Presence(Status.fromShowString(show), ver, hash, message);
 	}
 
 	public int compareTo(Object other) {
@@ -74,7 +79,15 @@ public class Presence implements Comparable {
 		return this.hash;
 	}
 
+	public String getMessage() {
+		return this.message;
+	}
+
 	public void setServiceDiscoveryResult(ServiceDiscoveryResult disco) {
 		this.disco = disco;
 	}
+
+	public ServiceDiscoveryResult getServiceDiscoveryResult() {
+		return disco;
+	}
 }