Move a chunk of classes over to using JID objects

8 files changed, 235 insertions, 195 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index 80a9d62f..e600f37b 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -2,7 +2,6 @@ package eu.siacs.conversations.entities;
 
 import java.security.interfaces.DSAPublicKey;
 import java.util.List;
-import java.util.Locale;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import net.java.otr4j.crypto.OtrCryptoEngineImpl;
@@ -16,6 +15,9 @@ import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.OtrEngine;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.xmpp.XmppConnection;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
+import eu.siacs.conversations.xmpp.jid.Jid;
+
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.os.SystemClock;
@@ -50,12 +52,10 @@ public class Account extends AbstractEntity {
 	public static final int STATUS_REGISTRATION_SUCCESSFULL = 9;
 	public static final int STATUS_REGISTRATION_NOT_SUPPORTED = 10;
 
-	protected String username;
-	protected String server;
+	protected Jid jid;
 	protected String password;
 	protected int options = 0;
 	protected String rosterVersion;
-	protected String resource = "mobile";
 	protected int status = -1;
 	protected JSONObject keys = new JSONObject();
 	protected String avatar;
@@ -69,31 +69,36 @@ public class Account extends AbstractEntity {
 	private String otrFingerprint;
 	private Roster roster = null;
 
-	private List<Bookmark> bookmarks = new CopyOnWriteArrayList<Bookmark>();
-	public List<Conversation> pendingConferenceJoins = new CopyOnWriteArrayList<Conversation>();
-	public List<Conversation> pendingConferenceLeaves = new CopyOnWriteArrayList<Conversation>();
+	private List<Bookmark> bookmarks = new CopyOnWriteArrayList<>();
+	public List<Conversation> pendingConferenceJoins = new CopyOnWriteArrayList<>();
+	public List<Conversation> pendingConferenceLeaves = new CopyOnWriteArrayList<>();
 
 	public Account() {
 		this.uuid = "0";
 	}
 
-	public Account(String username, String server, String password) {
-		this(java.util.UUID.randomUUID().toString(), username, server,
+	public Account(final Jid jid, final String password) {
+		this(java.util.UUID.randomUUID().toString(), jid,
 				password, 0, null, "", null);
 	}
 
-	public Account(String uuid, String username, String server,
-			String password, int options, String rosterVersion, String keys,
-			String avatar) {
+	public Account(final String uuid, final Jid jid,
+			final String password, final int options, final String rosterVersion, final String keys,
+			final String avatar) {
 		this.uuid = uuid;
-		this.username = username;
-		this.server = server;
+        this.jid = jid;
+        if (jid.getResourcepart().isEmpty()) {
+            try {
+                this.setResource("mobile");
+            } catch (final InvalidJidException ignored) {
+            }
+        }
 		this.password = password;
 		this.options = options;
 		this.rosterVersion = rosterVersion;
 		try {
 			this.keys = new JSONObject(keys);
-		} catch (JSONException e) {
+		} catch (final JSONException ignored) {
 
 		}
 		this.avatar = avatar;
@@ -112,30 +117,30 @@ public class Account extends AbstractEntity {
 	}
 
 	public String getUsername() {
-		return username;
+		return jid.getLocalpart();
 	}
 
-	public void setUsername(String username) {
-		this.username = username;
-	}
+	public void setUsername(final String username) throws InvalidJidException {
+        jid = Jid.fromParts(username, jid.getDomainpart(), jid.getResourcepart());
+    }
 
-	public String getServer() {
-		return server;
+	public Jid getServer() {
+		return jid.toDomainJid();
 	}
 
-	public void setServer(String server) {
-		this.server = server;
+	public void setServer(final String server) throws InvalidJidException {
+        jid = Jid.fromParts(jid.getLocalpart(), server, jid.getResourcepart());
 	}
 
 	public String getPassword() {
 		return password;
 	}
 
-	public void setPassword(String password) {
+	public void setPassword(final String password) {
 		this.password = password;
 	}
 
-	public void setStatus(int status) {
+	public void setStatus(final int status) {
 		this.status = status;
 	}
 
@@ -156,25 +161,19 @@ public class Account extends AbstractEntity {
 	}
 
 	public boolean hasErrorStatus() {
-		if (getXmppConnection() == null) {
-			return false;
-		} else {
-			return getStatus() > STATUS_NO_INTERNET
-					&& (getXmppConnection().getAttempt() >= 2);
-		}
+        return getXmppConnection() != null && getStatus() > STATUS_NO_INTERNET && (getXmppConnection().getAttempt() >= 2);
 	}
 
-	public void setResource(String resource) {
-		this.resource = resource;
+	public void setResource(final String resource) throws InvalidJidException {
+        jid = Jid.fromParts(jid.getLocalpart(), jid.getDomainpart(), resource);
 	}
 
 	public String getResource() {
-		return this.resource;
+		return jid.getResourcepart();
 	}
 
-	public String getJid() {
-		return username.toLowerCase(Locale.getDefault()) + "@"
-				+ server.toLowerCase(Locale.getDefault());
+	public Jid getJid() {
+        return jid.toBareJid();
 	}
 
 	public JSONObject getKeys() {
@@ -210,8 +209,8 @@ public class Account extends AbstractEntity {
 	public ContentValues getContentValues() {
 		ContentValues values = new ContentValues();
 		values.put(UUID, uuid);
-		values.put(USERNAME, username);
-		values.put(SERVER, server);
+		values.put(USERNAME, jid.getLocalpart());
+		values.put(SERVER, jid.getDomainpart());
 		values.put(PASSWORD, password);
 		values.put(OPTIONS, options);
 		values.put(KEYS, this.keys.toString());
@@ -221,9 +220,14 @@ public class Account extends AbstractEntity {
 	}
 
 	public static Account fromCursor(Cursor cursor) {
-		return new Account(cursor.getString(cursor.getColumnIndex(UUID)),
-				cursor.getString(cursor.getColumnIndex(USERNAME)),
-				cursor.getString(cursor.getColumnIndex(SERVER)),
+        Jid jid = null;
+        try {
+            jid = Jid.fromParts(cursor.getString(cursor.getColumnIndex(USERNAME)),
+                    cursor.getString(cursor.getColumnIndex(SERVER)), "mobile");
+        } catch (final InvalidJidException ignored) {
+        }
+        return new Account(cursor.getString(cursor.getColumnIndex(UUID)),
+                jid,
 				cursor.getString(cursor.getColumnIndex(PASSWORD)),
 				cursor.getInt(cursor.getColumnIndex(OPTIONS)),
 				cursor.getString(cursor.getColumnIndex(ROSTERVERSION)),
@@ -246,8 +250,8 @@ public class Account extends AbstractEntity {
 		this.xmppConnection = connection;
 	}
 
-	public String getFullJid() {
-		return this.getJid() + "/" + this.resource;
+	public Jid getFullJid() {
+        return this.getJid();
 	}
 
 	public String getOtrFingerprint() {
@@ -265,7 +269,7 @@ public class Account extends AbstractEntity {
 				builder.insert(26, " ");
 				builder.insert(35, " ");
 				this.otrFingerprint = builder.toString();
-			} catch (OtrCryptoException e) {
+			} catch (final OtrCryptoException ignored) {
 
 			}
 		}
diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
index dd9e805c..54dcfea1 100644
--- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
@@ -3,15 +3,17 @@ package eu.siacs.conversations.entities;
 import java.util.Locale;
 
 import eu.siacs.conversations.xml.Element;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
+import eu.siacs.conversations.xmpp.jid.Jid;
 
 public class Bookmark extends Element implements ListItem {
 
 	private Account account;
 	private Conversation mJoinedConversation;
 
-	public Bookmark(Account account, String jid) {
+	public Bookmark(final Account account, final Jid jid) {
 		super("conference");
-		this.setAttribute("jid", jid);
+		this.setAttribute("jid", jid.toString());
 		this.account = account;
 	}
 
@@ -55,10 +57,10 @@ public class Bookmark extends Element implements ListItem {
 	}
 
 	@Override
-	public int compareTo(ListItem another) {
-		return this.getDisplayName().compareToIgnoreCase(
-				another.getDisplayName());
-	}
+	public int compareTo(final ListItem another) {
+        return this.getDisplayName().compareToIgnoreCase(
+                another.getDisplayName());
+    }
 
 	@Override
 	public String getDisplayName() {
@@ -68,16 +70,20 @@ public class Bookmark extends Element implements ListItem {
 		} else if (getName() != null) {
 			return getName();
 		} else {
-			return this.getJid().split("@")[0];
+			return this.getJid().getLocalpart();
 		}
 	}
 
 	@Override
-	public String getJid() {
-		String jid = this.getAttribute("jid");
+	public Jid getJid() {
+		final String jid = this.getAttribute("jid");
 		if (jid != null) {
-			return jid.toLowerCase(Locale.US);
-		} else {
+            try {
+                return Jid.fromString(jid);
+            } catch (final InvalidJidException e) {
+                return null;
+            }
+        } else {
 			return null;
 		}
 	}
@@ -108,7 +114,7 @@ public class Bookmark extends Element implements ListItem {
 
 	public boolean match(String needle) {
 		return needle == null
-				|| getJid().contains(needle.toLowerCase(Locale.US))
+				|| getJid().toString().toLowerCase(Locale.US).contains(needle.toLowerCase(Locale.US))
 				|| getDisplayName().toLowerCase(Locale.US).contains(
 						needle.toLowerCase(Locale.US));
 	}
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index af5172d3..8fa91b02 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -1,16 +1,18 @@
 package eu.siacs.conversations.entities;
 
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Set;
+import android.content.ContentValues;
+import android.database.Cursor;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import eu.siacs.conversations.xml.Element;
-import android.content.ContentValues;
-import android.database.Cursor;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
+import eu.siacs.conversations.xmpp.jid.Jid;
 
 public class Contact implements ListItem {
 	public static final String TABLENAME = "contacts";
@@ -31,7 +33,7 @@ public class Contact implements ListItem {
 	protected String systemName;
 	protected String serverName;
 	protected String presenceName;
-	protected String jid;
+	protected Jid jid;
 	protected int subscription = 0;
 	protected String systemAccount;
 	protected String photoUri;
@@ -41,12 +43,10 @@ public class Contact implements ListItem {
 
 	protected Account account;
 
-	protected boolean inRoster = true;
-
 	public Lastseen lastseen = new Lastseen();
 
 	public Contact(final String account, final String systemName, final String serverName,
-		final String jid, final int subscription, final String photoUri,
+		final Jid jid, final int subscription, final String photoUri,
 		final String systemAccount, final String keys, final String avatar,
 		final Lastseen lastseen) {
 		this(account, systemName, serverName, jid, subscription, photoUri, systemAccount, keys,
@@ -55,7 +55,7 @@ public class Contact implements ListItem {
 	}
 
 	public Contact(final String account, final String systemName, final String serverName,
-		final String jid, final int subscription, final String photoUri,
+		final Jid jid, final int subscription, final String photoUri,
 		final String systemAccount, final String keys, final String avatar) {
 		this.accountUuid = account;
 		this.systemName = systemName;
@@ -72,7 +72,7 @@ public class Contact implements ListItem {
 		this.avatar = avatar;
 	}
 
-	public Contact(final String jid) {
+	public Contact(final Jid jid) {
 		this.jid = jid;
 	}
 
@@ -84,7 +84,7 @@ public class Contact implements ListItem {
 		} else if (this.presenceName != null) {
 			return this.presenceName;
 		} else {
-			return this.jid.split("@")[0];
+			return jid.getLocalpart();
 		}
 	}
 
@@ -92,13 +92,13 @@ public class Contact implements ListItem {
 		return this.photoUri;
 	}
 
-	public String getJid() {
-		return this.jid.toLowerCase(Locale.getDefault());
+	public Jid getJid() {
+		return jid;
 	}
 
 	public boolean match(String needle) {
 		return needle == null
-				|| jid.contains(needle.toLowerCase())
+				|| jid.toString().contains(needle.toLowerCase())
 				|| getDisplayName().toLowerCase()
 						.contains(needle.toLowerCase());
 	}
@@ -108,7 +108,7 @@ public class Contact implements ListItem {
 		values.put(ACCOUNT, accountUuid);
 		values.put(SYSTEMNAME, systemName);
 		values.put(SERVERNAME, serverName);
-		values.put(JID, jid);
+		values.put(JID, jid.toString());
 		values.put(OPTIONS, subscription);
 		values.put(SYSTEMACCOUNT, systemAccount);
 		values.put(PHOTOURI, photoUri);
@@ -123,10 +123,17 @@ public class Contact implements ListItem {
 		final Lastseen lastseen = new Lastseen(
 				cursor.getString(cursor.getColumnIndex(LAST_PRESENCE)),
 				cursor.getLong(cursor.getColumnIndex(LAST_TIME)));
-		return new Contact(cursor.getString(cursor.getColumnIndex(ACCOUNT)),
+        final Jid jid;
+        try {
+            jid = Jid.fromString(cursor.getString(cursor.getColumnIndex(JID)));
+        } catch (final InvalidJidException e) {
+            // TODO: Borked DB... handle this somehow?
+            return null;
+        }
+        return new Contact(cursor.getString(cursor.getColumnIndex(ACCOUNT)),
 				cursor.getString(cursor.getColumnIndex(SYSTEMNAME)),
 				cursor.getString(cursor.getColumnIndex(SERVERNAME)),
-				cursor.getString(cursor.getColumnIndex(JID)),
+				jid,
 				cursor.getInt(cursor.getColumnIndex(OPTIONS)),
 				cursor.getString(cursor.getColumnIndex(PHOTOURI)),
 				cursor.getString(cursor.getColumnIndex(SYSTEMACCOUNT)),
@@ -198,7 +205,7 @@ public class Contact implements ListItem {
 	}
 
 	public Set<String> getOtrFingerprints() {
-		Set<String> set = new HashSet<String>();
+		Set<String> set = new HashSet<>();
 		try {
 			if (this.keys.has("otr_fingerprints")) {
 				JSONArray fingerprints = this.keys
@@ -225,7 +232,7 @@ public class Contact implements ListItem {
 			}
 			fingerprints.put(print);
 			this.keys.put("otr_fingerprints", fingerprints);
-		} catch (JSONException e) {
+		} catch (final JSONException ignored) {
 
 		}
 	}
@@ -233,7 +240,7 @@ public class Contact implements ListItem {
 	public void setPgpKeyId(long keyId) {
 		try {
 			this.keys.put("pgp_keyid", keyId);
-		} catch (JSONException e) {
+		} catch (final JSONException ignored) {
 
 		}
 	}
@@ -273,21 +280,26 @@ public class Contact implements ListItem {
 		String subscription = item.getAttribute("subscription");
 
 		if (subscription != null) {
-			if (subscription.equals("to")) {
-				this.resetOption(Contact.Options.FROM);
-				this.setOption(Contact.Options.TO);
-			} else if (subscription.equals("from")) {
-				this.resetOption(Contact.Options.TO);
-				this.setOption(Contact.Options.FROM);
-				this.resetOption(Contact.Options.PREEMPTIVE_GRANT);
-			} else if (subscription.equals("both")) {
-				this.setOption(Contact.Options.TO);
-				this.setOption(Contact.Options.FROM);
-				this.resetOption(Contact.Options.PREEMPTIVE_GRANT);
-			} else if (subscription.equals("none")) {
-				this.resetOption(Contact.Options.FROM);
-				this.resetOption(Contact.Options.TO);
-			}
+            switch (subscription) {
+                case "to":
+                    this.resetOption(Options.FROM);
+                    this.setOption(Options.TO);
+                    break;
+                case "from":
+                    this.resetOption(Options.TO);
+                    this.setOption(Options.FROM);
+                    this.resetOption(Options.PREEMPTIVE_GRANT);
+                    break;
+                case "both":
+                    this.setOption(Options.TO);
+                    this.setOption(Options.FROM);
+                    this.resetOption(Options.PREEMPTIVE_GRANT);
+                    break;
+                case "none":
+                    this.resetOption(Options.FROM);
+                    this.resetOption(Options.TO);
+                    break;
+            }
 		}
 
 		// do NOT override asking if pending push request
@@ -301,8 +313,8 @@ public class Contact implements ListItem {
 	}
 
 	public Element asElement() {
-		Element item = new Element("item");
-		item.setAttribute("jid", this.jid);
+		final Element item = new Element("item");
+		item.setAttribute("jid", this.jid.toString());
 		if (this.serverName != null) {
 			item.setAttribute("name", this.serverName);
 		}
@@ -335,18 +347,13 @@ public class Contact implements ListItem {
 	}
 
 	@Override
-	public int compareTo(ListItem another) {
+	public int compareTo(final ListItem another) {
 		return this.getDisplayName().compareToIgnoreCase(
 				another.getDisplayName());
 	}
 
-	public String getServer() {
-		String[] split = getJid().split("@");
-		if (split.length >= 2) {
-			return split[1];
-		} else {
-			return null;
-		}
+	public Jid getServer() {
+		return getJid().toDomainJid();
 	}
 
 	public boolean setAvatar(String filename) {
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 9d4c36db..fdffeccb 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1,13 +1,8 @@
 package eu.siacs.conversations.entities;
 
-import java.security.interfaces.DSAPublicKey;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import eu.siacs.conversations.services.XmppConnectionService;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.os.SystemClock;
 
 import net.java.otr4j.OtrException;
 import net.java.otr4j.crypto.OtrCryptoEngineImpl;
@@ -15,9 +10,17 @@ import net.java.otr4j.crypto.OtrCryptoException;
 import net.java.otr4j.session.SessionID;
 import net.java.otr4j.session.SessionImpl;
 import net.java.otr4j.session.SessionStatus;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.os.SystemClock;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.security.interfaces.DSAPublicKey;
+import java.util.ArrayList;
+import java.util.List;
+
+import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
+import eu.siacs.conversations.xmpp.jid.Jid;
 
 public class Conversation extends AbstractEntity {
 	public static final String TABLENAME = "conversations";
@@ -45,7 +48,7 @@ public class Conversation extends AbstractEntity {
 	private String name;
 	private String contactUuid;
 	private String accountUuid;
-	private String contactJid;
+	private Jid contactJid;
 	private int status;
 	private long created;
 	private int mode;
@@ -54,7 +57,7 @@ public class Conversation extends AbstractEntity {
 
 	private String nextPresence;
 
-	protected ArrayList<Message> messages = new ArrayList<Message>();
+	protected ArrayList<Message> messages = new ArrayList<>();
 	protected Account account = null;
 
 	private transient SessionImpl otrSession;
@@ -71,17 +74,17 @@ public class Conversation extends AbstractEntity {
 
 	private Bookmark bookmark;
 
-	public Conversation(String name, Account account, String contactJid,
-			int mode) {
+	public Conversation(final String name, final Account account, final Jid contactJid,
+			final int mode) {
 		this(java.util.UUID.randomUUID().toString(), name, null, account
 				.getUuid(), contactJid, System.currentTimeMillis(),
 				STATUS_AVAILABLE, mode, "");
 		this.account = account;
 	}
 
-	public Conversation(String uuid, String name, String contactUuid,
-			String accountUuid, String contactJid, long created, int status,
-			int mode, String attributes) {
+	public Conversation(final String uuid, final String name, final String contactUuid,
+			final String accountUuid, final Jid contactJid, final long created, final int status,
+			final int mode, final String attributes) {
 		this.uuid = uuid;
 		this.name = name;
 		this.contactUuid = contactUuid;
@@ -91,10 +94,7 @@ public class Conversation extends AbstractEntity {
 		this.status = status;
 		this.mode = mode;
 		try {
-			if (attributes == null) {
-				attributes = new String();
-			}
-			this.attributes = new JSONObject(attributes);
+			this.attributes = new JSONObject(attributes == null ? "" : attributes);
 		} catch (JSONException e) {
 			this.attributes = new JSONObject();
 		}
@@ -105,10 +105,8 @@ public class Conversation extends AbstractEntity {
 	}
 
 	public boolean isRead() {
-		if ((this.messages == null) || (this.messages.size() == 0))
-			return true;
-		return this.messages.get(this.messages.size() - 1).isRead();
-	}
+        return (this.messages == null) || (this.messages.size() == 0) || this.messages.get(this.messages.size() - 1).isRead();
+    }
 
 	public void markRead() {
 		if (this.messages == null) {
@@ -186,7 +184,7 @@ public class Conversation extends AbstractEntity {
 		this.account = account;
 	}
 
-	public String getContactJid() {
+	public Jid getContactJid() {
 		return this.contactJid;
 	}
 
@@ -204,7 +202,7 @@ public class Conversation extends AbstractEntity {
 		values.put(NAME, name);
 		values.put(CONTACT, contactUuid);
 		values.put(ACCOUNT, accountUuid);
-		values.put(CONTACTJID, contactJid);
+		values.put(CONTACTJID, contactJid.toString());
 		values.put(CREATED, created);
 		values.put(STATUS, status);
 		values.put(MODE, mode);
@@ -213,11 +211,18 @@ public class Conversation extends AbstractEntity {
 	}
 
 	public static Conversation fromCursor(Cursor cursor) {
-		return new Conversation(cursor.getString(cursor.getColumnIndex(UUID)),
+        Jid jid;
+        try {
+            jid = Jid.fromString(cursor.getString(cursor.getColumnIndex(CONTACTJID)));
+        } catch (final InvalidJidException e) {
+            // Borked DB..
+            jid = null;
+        }
+        return new Conversation(cursor.getString(cursor.getColumnIndex(UUID)),
 				cursor.getString(cursor.getColumnIndex(NAME)),
 				cursor.getString(cursor.getColumnIndex(CONTACT)),
 				cursor.getString(cursor.getColumnIndex(ACCOUNT)),
-				cursor.getString(cursor.getColumnIndex(CONTACTJID)),
+				jid,
 				cursor.getLong(cursor.getColumnIndex(CREATED)),
 				cursor.getInt(cursor.getColumnIndex(STATUS)),
 				cursor.getInt(cursor.getColumnIndex(MODE)),
@@ -241,8 +246,9 @@ public class Conversation extends AbstractEntity {
 		if (this.otrSession != null) {
 			return this.otrSession;
 		} else {
-			SessionID sessionId = new SessionID(this.getContactJid().split("/",
-					2)[0], presence, "xmpp");
+            final SessionID sessionId = new SessionID(this.getContactJid().toBareJid().toString(),
+                    presence,
+                    "xmpp");
 			this.otrSession = new SessionImpl(sessionId, getAccount()
 					.getOtrEngine(service));
 			try {
@@ -317,7 +323,7 @@ public class Conversation extends AbstractEntity {
 				builder.insert(26, " ");
 				builder.insert(35, " ");
 				this.otrFingerprint = builder.toString();
-			} catch (OtrCryptoException e) {
+			} catch (final OtrCryptoException ignored) {
 
 			}
 		}
@@ -335,7 +341,7 @@ public class Conversation extends AbstractEntity {
 		this.mucOptions = null;
 	}
 
-	public void setContactJid(String jid) {
+	public void setContactJid(final Jid jid) {
 		this.contactJid = jid;
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/entities/ListItem.java b/src/main/java/eu/siacs/conversations/entities/ListItem.java
index a1872d2f..fa650f1c 100644
--- a/src/main/java/eu/siacs/conversations/entities/ListItem.java
+++ b/src/main/java/eu/siacs/conversations/entities/ListItem.java
@@ -1,7 +1,9 @@
 package eu.siacs.conversations.entities;
 
+import eu.siacs.conversations.xmpp.jid.Jid;
+
 public interface ListItem extends Comparable<ListItem> {
 	public String getDisplayName();
 
-	public String getJid();
+	public Jid getJid();
 }
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index b33d5f37..ce21addc 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -5,6 +5,9 @@ import java.net.URL;
 import java.util.Arrays;
 
 import eu.siacs.conversations.Config;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
+import eu.siacs.conversations.xmpp.jid.Jid;
+
 import android.content.ContentValues;
 import android.database.Cursor;
 
@@ -44,7 +47,7 @@ public class Message extends AbstractEntity {
 	public static String REMOTE_MSG_ID = "remoteMsgId";
 
 	protected String conversationUuid;
-	protected String counterpart;
+	protected Jid counterpart;
 	protected String trueCounterpart;
 	protected String body;
 	protected String encryptedBody;
@@ -74,17 +77,17 @@ public class Message extends AbstractEntity {
 		this.conversation = conversation;
 	}
 
-	public Message(Conversation conversation, String counterpart, String body,
-			int encryption, int status) {
+	public Message(final Conversation conversation, final Jid counterpart, final String body,
+			final int encryption, final int status) {
 		this(java.util.UUID.randomUUID().toString(), conversation.getUuid(),
 				counterpart, null, body, System.currentTimeMillis(),
 				encryption, status, TYPE_TEXT, null);
 		this.conversation = conversation;
 	}
 
-	public Message(String uuid, String conversationUUid, String counterpart,
-			String trueCounterpart, String body, long timeSent, int encryption,
-			int status, int type, String remoteMsgId) {
+	public Message(final String uuid, final String conversationUUid, final Jid counterpart,
+			final String trueCounterpart, final String body, final long timeSent,
+            final int encryption, final int status, final int type, final String remoteMsgId) {
 		this.uuid = uuid;
 		this.conversationUuid = conversationUUid;
 		this.counterpart = counterpart;
@@ -102,7 +105,7 @@ public class Message extends AbstractEntity {
 		ContentValues values = new ContentValues();
 		values.put(UUID, uuid);
 		values.put(CONVERSATION, conversationUuid);
-		values.put(COUNTERPART, counterpart);
+		values.put(COUNTERPART, counterpart.toString());
 		values.put(TRUE_COUNTERPART, trueCounterpart);
 		values.put(BODY, body);
 		values.put(TIME_SENT, timeSent);
@@ -121,7 +124,7 @@ public class Message extends AbstractEntity {
 		return this.conversation;
 	}
 
-	public String getCounterpart() {
+	public Jid getCounterpart() {
 		return counterpart;
 	}
 
@@ -163,9 +166,15 @@ public class Message extends AbstractEntity {
 	}
 
 	public static Message fromCursor(Cursor cursor) {
-		return new Message(cursor.getString(cursor.getColumnIndex(UUID)),
+        Jid jid;
+        try {
+            jid = Jid.fromString(cursor.getString(cursor.getColumnIndex(COUNTERPART)));
+        } catch (InvalidJidException e) {
+            jid = null;
+        }
+        return new Message(cursor.getString(cursor.getColumnIndex(UUID)),
 				cursor.getString(cursor.getColumnIndex(CONVERSATION)),
-				cursor.getString(cursor.getColumnIndex(COUNTERPART)),
+				jid,
 				cursor.getString(cursor.getColumnIndex(TRUE_COUNTERPART)),
 				cursor.getString(cursor.getColumnIndex(BODY)),
 				cursor.getLong(cursor.getColumnIndex(TIME_SENT)),
@@ -225,11 +234,14 @@ public class Message extends AbstractEntity {
 
 	public void setPresence(String presence) {
 		if (presence == null) {
-			this.counterpart = this.counterpart.split("/", 2)[0];
+			this.counterpart = this.counterpart.toBareJid();
 		} else {
-			this.counterpart = this.counterpart.split("/", 2)[0] + "/"
-					+ presence;
-		}
+            try {
+                this.counterpart = Jid.fromString(this.counterpart.toBareJid() + "/" + presence);
+            } catch (final InvalidJidException ignored) {
+                // TODO: Handle this?
+            }
+        }
 	}
 
 	public void setTrueCounterpart(String trueCounterpart) {
@@ -237,15 +249,11 @@ public class Message extends AbstractEntity {
 	}
 
 	public String getPresence() {
-		String[] counterparts = this.counterpart.split("/", 2);
-		if (counterparts.length == 2) {
-			return counterparts[1];
+		if (!counterpart.getResourcepart().isEmpty()) {
+			return counterpart.getResourcepart();
 		} else {
-			if (this.counterpart.contains("/")) {
-				return "";
-			} else {
-				return null;
-			}
+            // TODO: Return empty string or null?
+			return null;
 		}
 	}
 
@@ -264,7 +272,7 @@ public class Message extends AbstractEntity {
 		return message;
 	}
 
-	public void setCounterpart(String counterpart) {
+	public void setCounterpart(final Jid counterpart) {
 		this.counterpart = counterpart;
 	}
 
@@ -359,11 +367,7 @@ public class Message extends AbstractEntity {
 
 	public boolean wasMergedIntoPrevious() {
 		Message prev = this.prev();
-		if (prev == null) {
-			return false;
-		} else {
-			return prev.mergeable(this);
-		}
+        return prev != null && prev.mergeable(this);
 	}
 	
 	public boolean trusted() {
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index d7407cd5..f83387fc 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -6,6 +6,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import eu.siacs.conversations.crypto.PgpEngine;
 import eu.siacs.conversations.xml.Element;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
+import eu.siacs.conversations.xmpp.jid.Jid;
 import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
 import android.annotation.SuppressLint;
 
@@ -66,15 +68,20 @@ public class MucOptions {
 
 		public void setRole(String role) {
 			role = role.toLowerCase();
-			if (role.equals("moderator")) {
-				this.role = ROLE_MODERATOR;
-			} else if (role.equals("participant")) {
-				this.role = ROLE_PARTICIPANT;
-			} else if (role.equals("visitor")) {
-				this.role = ROLE_VISITOR;
-			} else {
-				this.role = ROLE_NONE;
-			}
+            switch (role) {
+                case "moderator":
+                    this.role = ROLE_MODERATOR;
+                    break;
+                case "participant":
+                    this.role = ROLE_PARTICIPANT;
+                    break;
+                case "visitor":
+                    this.role = ROLE_VISITOR;
+                    break;
+                default:
+                    this.role = ROLE_NONE;
+                    break;
+            }
 		}
 
 		public int getAffiliation() {
@@ -109,7 +116,7 @@ public class MucOptions {
 	}
 
 	private Account account;
-	private List<User> users = new CopyOnWriteArrayList<User>();
+	private List<User> users = new CopyOnWriteArrayList<>();
 	private Conversation conversation;
 	private boolean isOnline = false;
 	private int error = ERROR_ROOM_NOT_FOUND;
@@ -233,13 +240,12 @@ public class MucOptions {
 	}
 
 	public String getProposedNick() {
-		String[] mucParts = conversation.getContactJid().split("/", 2);
 		if (conversation.getBookmark() != null
 				&& conversation.getBookmark().getNick() != null) {
 			return conversation.getBookmark().getNick();
 		} else {
-			if (mucParts.length == 2) {
-				return mucParts[1];
+			if (!conversation.getContactJid().getResourcepart().isEmpty()) {
+				return conversation.getContactJid().getResourcepart();
 			} else {
 				return account.getUsername();
 			}
@@ -297,7 +303,7 @@ public class MucOptions {
 	}
 
 	public long[] getPgpKeyIds() {
-		List<Long> ids = new ArrayList<Long>();
+		List<Long> ids = new ArrayList<>();
 		for (User user : getUsers()) {
 			if (user.getPgpKeyId() != 0) {
 				ids.add(user.getPgpKeyId());
@@ -328,10 +334,14 @@ public class MucOptions {
 		return true;
 	}
 
-	public String getJoinJid() {
-		return this.conversation.getContactJid().split("/", 2)[0] + "/"
-				+ this.joinnick;
-	}
+	public Jid getJoinJid() {
+        try {
+            return Jid.fromString(this.conversation.getContactJid().toBareJid().toString() + "/"
++ this.joinnick);
+        } catch (final InvalidJidException e) {
+            return null;
+        }
+    }
 
 	public String getTrueCounterpart(String counterpart) {
 		for (User user : this.getUsers()) {
diff --git a/src/main/java/eu/siacs/conversations/entities/Roster.java b/src/main/java/eu/siacs/conversations/entities/Roster.java
index 3267b15a..27d4deb0 100644
--- a/src/main/java/eu/siacs/conversations/entities/Roster.java
+++ b/src/main/java/eu/siacs/conversations/entities/Roster.java
@@ -2,12 +2,13 @@ package eu.siacs.conversations.entities;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.concurrent.ConcurrentHashMap;
 
+import eu.siacs.conversations.xmpp.jid.Jid;
+
 public class Roster {
 	Account account;
-	ConcurrentHashMap<String, Contact> contacts = new ConcurrentHashMap<String, Contact>();
+	final ConcurrentHashMap<String, Contact> contacts = new ConcurrentHashMap<>();
 	private String version = null;
 
 	public Roster(Account account) {
@@ -27,14 +28,14 @@ public class Roster {
 		}
 	}
 
-	public Contact getContact(String jid) {
-		String cleanJid = jid.split("/", 2)[0].toLowerCase(Locale.getDefault());
-		if (contacts.containsKey(cleanJid)) {
-			return contacts.get(cleanJid);
+	public Contact getContact(final Jid jid) {
+		final Jid bareJid = jid.toBareJid();
+		if (contacts.containsKey(bareJid.toString())) {
+			return contacts.get(bareJid.toString());
 		} else {
-			Contact contact = new Contact(cleanJid);
+			Contact contact = new Contact(bareJid);
 			contact.setAccount(account);
-			contacts.put(cleanJid, contact);
+			contacts.put(bareJid.toString(), contact);
 			return contact;
 		}
 	}
@@ -60,13 +61,13 @@ public class Roster {
 	}
 
 	public List<Contact> getContacts() {
-		return new ArrayList<Contact>(this.contacts.values());
+		return new ArrayList<>(this.contacts.values());
 	}
 
-	public void initContact(Contact contact) {
+	public void initContact(final Contact contact) {
 		contact.setAccount(account);
 		contact.setOption(Contact.Options.IN_ROSTER);
-		contacts.put(contact.getJid(), contact);
+		contacts.put(contact.getJid().toBareJid().toString(), contact);
 	}
 
 	public void setVersion(String version) {