narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed npe when binval value of vcard avatar is null

Browse source
This commit is contained in:
Daniel Gultsch 2015-05-07 11:07:15 +02:00
parent d74e8a8a0e
commit 05f0aa614f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -1988,8 +1988,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
Element vCard = packet.findChild("vCard","vcard-temp"); Element vCard = packet.findChild("vCard","vcard-temp");
Element photo = vCard != null ? vCard.findChild("PHOTO") : null; Element photo = vCard != null ? vCard.findChild("PHOTO") : null;
Element binval = photo != null ? photo.findChild("BINVAL") : null; Element binval = photo != null ? photo.findChild("BINVAL") : null;
if (binval != null) { String image = binval != null ? binval.getContent() : null;
avatar.image = binval.getContent(); if (image != null) {
avatar.image = image;
if (getFileBackend().save(avatar)) { if (getFileBackend().save(avatar)) {
Log.d(Config.LOGTAG, account.getJid().toBareJid() Log.d(Config.LOGTAG, account.getJid().toBareJid()
+ ": successfully fetched vCard avatar for " + avatar.owner); + ": successfully fetched vCard avatar for " + avatar.owner);