From 9053f4aca0c232db77dbd0a1e5b9b09bf41bec22 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Wed, 5 Nov 2014 15:55:47 -0500
Subject: Move a chunk of classes over to using JID objects

---
 .../eu/siacs/conversations/entities/Roster.java    | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/entities/Roster.java')

diff --git a/src/main/java/eu/siacs/conversations/entities/Roster.java b/src/main/java/eu/siacs/conversations/entities/Roster.java
index 3267b15ae..27d4deb02 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) {
-- 
cgit v1.2.3