From c1135ad592debdafff3afacab83214a5fd260aa0 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 11 Mar 2018 14:14:56 +0100
Subject: [PATCH] use escaped form of jid where approriate

---
 .../java/eu/siacs/conversations/entities/Account.java     | 4 ++--
 .../siacs/conversations/ui/ConferenceDetailsActivity.java | 2 +-
 .../eu/siacs/conversations/ui/ContactDetailsActivity.java | 2 +-
 .../siacs/conversations/xmpp/stanzas/AbstractStanza.java  | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index ca01d618b..f0944d52c 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -618,7 +618,7 @@ public class Account extends AbstractEntity {
 
 	public String getShareableUri() {
 		List<XmppUri.Fingerprint> fingerprints = this.getFingerprints();
-		String uri = "xmpp:"+this.getJid().asBareJid().toString();
+		String uri = "xmpp:"+this.getJid().asBareJid().toEscapedString();
 		if (fingerprints.size() > 0) {
 			return XmppUri.getFingerprintUri(uri,fingerprints,';');
 		} else {
@@ -628,7 +628,7 @@ public class Account extends AbstractEntity {
 
 	public String getShareableLink() {
 		List<XmppUri.Fingerprint> fingerprints = this.getFingerprints();
-		String uri = "https://conversations.im/i/"+this.getJid().asBareJid().toString();
+		String uri = "https://conversations.im/i/"+this.getJid().asBareJid().toEscapedString();
 		if (fingerprints.size() > 0) {
 			return XmppUri.getFingerprintUri(uri,fingerprints,'&');
 		} else {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index da64bb529..7965a1663 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -329,7 +329,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 	protected String getShareableUri(boolean http) {
 		if (mConversation != null) {
 			if (http) {
-				return "https://conversations.im/j/"+ mConversation.getJid().asBareJid();
+				return "https://conversations.im/j/"+ mConversation.getJid().asBareJid().toEscapedString();
 			} else {
 				return "xmpp:"+mConversation.getJid().asBareJid()+"?join";
 			}
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 5b5fa100f..88c77cd50 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -167,7 +167,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
 	protected String getShareableUri(boolean http) {
 		final String prefix = http ? "https://conversations.im/i/" : "xmpp:";
 		if (contact != null) {
-			return prefix+contact.getJid().asBareJid().toString();
+			return prefix+contact.getJid().asBareJid().toEscapedString();
 		} else {
 			return "";
 		}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
index 7fd261add..d17eb3254 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
@@ -20,26 +20,26 @@ public class AbstractStanza extends Element {
 
 	public void setTo(final Jid to) {
 		if (to != null) {
-			setAttribute("to", to.toString());
+			setAttribute("to", to.toEscapedString());
 		}
 	}
 
 	public void setFrom(final Jid from) {
 		if (from != null) {
-			setAttribute("from", from.toString());
+			setAttribute("from", from.toEscapedString());
 		}
 	}
 
 	public boolean fromServer(final Account account) {
 		return getFrom() == null
-			|| getFrom().equals(account.getServer())
+			|| getFrom().equals(Jid.of(account.getServer()))
 			|| getFrom().equals(account.getJid().asBareJid())
 			|| getFrom().equals(account.getJid());
 	}
 
 	public boolean toServer(final Account account) {
 		return getTo() == null
-			|| getTo().equals(account.getServer())
+			|| getTo().equals(Jid.of(account.getServer()))
 			|| getTo().equals(account.getJid().asBareJid())
 			|| getTo().equals(account.getJid());
 	}