From e32f380dae4913d8152fc92b76193de241089cf8 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 14 May 2015 14:42:21 +0200
Subject: provide helper function for getting the content of a child directly

---
 src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java')

diff --git a/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java b/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
index 04d55bbe..74da6a9b 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
@@ -83,8 +83,7 @@ public class Avatar {
 	}
 
 	public static Avatar parsePresence(Element x) {
-		Element photo = x != null ? x.findChild("photo") : null;
-		String hash = photo != null ? photo.getContent() : null;
+		String hash = x == null ? null : x.findChildContent("photo");
 		if (hash == null) {
 			return null;
 		}
-- 
cgit v1.2.3