From 5db04a37bd5b7acc41a8f2dad941fabd9a6a97e8 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 25 Jun 2014 17:32:58 +0200
Subject: fixed two rare npe

---
 src/eu/siacs/conversations/parser/PresenceParser.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/src/eu/siacs/conversations/parser/PresenceParser.java b/src/eu/siacs/conversations/parser/PresenceParser.java
index 2003d4cd6..8cc57bad3 100644
--- a/src/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/eu/siacs/conversations/parser/PresenceParser.java
@@ -37,7 +37,10 @@ public class PresenceParser extends AbstractParser {
 	}
 
 	public void parseContactPresence(PresencePacket packet, Account account) {
-		String[] fromParts = packet.getAttribute("from").split("/");
+		if (packet.getFrom()==null) {
+			return;
+		}
+		String[] fromParts = packet.getFrom().split("/");
 		String type = packet.getAttribute("type");
 		if (fromParts[0].equals(account.getJid())) {
 			if (fromParts.length == 2) {
-- 
cgit v1.2.3