diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-06-23 12:15:18 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-06-23 12:15:18 +0200 |
| commit | 2dd16a8b56e7755582b2f195fd86deb1ea77252d (patch) | |
| tree | 97342ad18be891ee0d4adfd45d19fd63bdc74e10 /src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java | |
| parent | 9b7a606cb03bbaf36fc691f02ef32ab9c158de6d (diff) | |
| parent | 5a48afdd4d44b5865831df470a2c5d00e9cc9599 (diff) | |
Merge branch 'development'1.4.4
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java | 3 |
1 files changed, 1 insertions, 2 deletions
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; } |