mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-11-26 16:22:06 +01:00
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
This commit is contained in:
parent
5d30c8ac26
commit
76087c3928
1 changed files with 16 additions and 10 deletions
|
@ -333,10 +333,7 @@ public class VCard extends IQ {
|
|||
e.printStackTrace();
|
||||
}
|
||||
|
||||
String encodedImage = StringUtils.encodeBase64(bytes);
|
||||
avatar = encodedImage;
|
||||
|
||||
setField("PHOTO", "<TYPE>image/jpeg</TYPE><BINVAL>" + encodedImage + "</BINVAL>", 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;
|
||||
|
||||
|
@ -417,7 +421,8 @@ public class VCard extends IQ {
|
|||
throw new IOException("Entire file not read");
|
||||
}
|
||||
return buffer;
|
||||
} finally {
|
||||
}
|
||||
finally {
|
||||
if (bis != null) {
|
||||
bis.close();
|
||||
}
|
||||
|
@ -467,6 +472,7 @@ public class VCard extends IQ {
|
|||
* and not anonymous.<p>
|
||||
* <p/>
|
||||
* 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.
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue