From 76087c3928e0446591c6edd9bb94bf3b7a220eb1 Mon Sep 17 00:00:00 2001 From: Derek DeMoro Date: Tue, 13 Feb 2007 17:00:44 +0000 Subject: [PATCH] Unable to remove avatar in current model. This is now fixed. git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7084 b35dd754-fafc-0310-a699-88a17e54d16e --- .../org/jivesoftware/smackx/packet/VCard.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/source/org/jivesoftware/smackx/packet/VCard.java b/source/org/jivesoftware/smackx/packet/VCard.java index 1f1a2c4f6..a05842406 100644 --- a/source/org/jivesoftware/smackx/packet/VCard.java +++ b/source/org/jivesoftware/smackx/packet/VCard.java @@ -149,12 +149,12 @@ public class VCard extends IQ { * Set generic, unescapable VCard field. If unescabale is set to true, XML maybe a part of the * value. * - * @param value value of field - * @param field field to set. See {@link #getField(String)} + * @param value value of field + * @param field field to set. See {@link #getField(String)} * @param isUnescapable True if the value should not be escaped, and false if it should. */ public void setField(String field, String value, boolean isUnescapable) { - if(!isUnescapable) { + if (!isUnescapable) { otherSimpleFields.put(field, value); } else { @@ -333,10 +333,7 @@ public class VCard extends IQ { e.printStackTrace(); } - String encodedImage = StringUtils.encodeBase64(bytes); - avatar = encodedImage; - - setField("PHOTO", "image/jpeg" + encodedImage + "", true); + setAvatar(bytes); } /** @@ -345,6 +342,13 @@ public class VCard extends IQ { * @param bytes the bytes of the avatar. */ public void setAvatar(byte[] bytes) { + if (bytes == null) { + // Remove avatar (if any) from mappings + otherUnescapableFields.remove("PHOTO"); + return; + } + + // Otherwise, add to mappings. String encodedImage = StringUtils.encodeBase64(bytes); avatar = encodedImage; @@ -413,12 +417,13 @@ public class VCard extends IQ { int bytes = (int) file.length(); byte[] buffer = new byte[bytes]; int readBytes = bis.read(buffer); - if(readBytes != buffer.length) { + if (readBytes != buffer.length) { throw new IOException("Entire file not read"); } return buffer; - } finally { - if(bis != null) { + } + finally { + if (bis != null) { bis.close(); } } @@ -467,6 +472,7 @@ public class VCard extends IQ { * and not anonymous.

*

* NOTE: the method is asynchronous and does not wait for the returned value. + * * @param connection the XMPPConnection to use. * @throws XMPPException thrown if there was an issue setting the VCard in the server. */