From 385bea0fe364d5a9ab7d4a13b5c93eb46016ea9d Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 9 Nov 2014 13:13:19 -0500
Subject: s/getResourcepart().isEmpty()/isBareJid()/

---
 src/main/java/eu/siacs/conversations/parser/AbstractParser.java | 2 +-
 src/main/java/eu/siacs/conversations/parser/MessageParser.java  | 2 +-
 src/main/java/eu/siacs/conversations/parser/PresenceParser.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/parser')

diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
index 9e4130524..eedfca16e 100644
--- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
@@ -69,7 +69,7 @@ public abstract class AbstractParser {
             // TODO: Handle this?
             from = null;
         }
-        String presence = from == null || from.getResourcepart().isEmpty() ? "" : from.getResourcepart();
+        String presence = from == null || from.isBareJid() ? "" : from.getResourcepart();
 		Contact contact = account.getRoster().getContact(from);
 		long timestamp = getTimestamp(packet);
 		if (timestamp >= contact.lastseen.time) {
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index e4ae2701c..c68a6b235 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -40,7 +40,7 @@ public class MessageParser extends AbstractParser implements
 		finishedMessage.setRemoteMsgId(packet.getId());
 		finishedMessage.markable = isMarkable(packet);
 		if (conversation.getMode() == Conversation.MODE_MULTI
-				&& !jid.getResourcepart().isEmpty()) {
+				&& !jid.isBareJid()) {
 			finishedMessage.setType(Message.TYPE_PRIVATE);
 			finishedMessage.setCounterpart(packet.getFrom());
 			finishedMessage.setTrueCounterpart(conversation.getMucOptions()
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index bd487c79c..635f29327 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -56,7 +56,7 @@ public class PresenceParser extends AbstractParser implements
         final Jid from = packet.getFrom();
 		String type = packet.getAttribute("type");
 		if (from.toBareJid().equals(account.getJid().toBareJid())) {
-			if (!from.getResourcepart().isEmpty()) {
+			if (!from.isBareJid()) {
 				if (type == null) {
 					account.updatePresence(from.getResourcepart(),
 							Presences.parseShow(packet.findChild("show")));
@@ -69,7 +69,7 @@ public class PresenceParser extends AbstractParser implements
 			Contact contact = account.getRoster().getContact(packet.getFrom());
 			if (type == null) {
 				String presence;
-				if (!from.getResourcepart().isEmpty()) {
+				if (!from.isBareJid()) {
 					presence = from.getResourcepart();
 				} else {
 					presence = "";
-- 
cgit v1.2.3