Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-30 02:02:06 +01:00
Code Issues Releases Wiki Activity

SMACK-413 Put removed public method back in and marked as deprecated. We can remove in major release.

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13592 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
rcollier 2013-03-24 15:02:25 +00:00
parent 998245be26
commit 58f56ee31b
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/org/jivesoftware/smackx/packet/VCard.java
View file

@ -85,7 +85,8 @@ import org.jivesoftware.smack.util.StringUtils;
* @author Kirill Maximov (kir@maxkir.com) * @author Kirill Maximov (kir@maxkir.com)
*/ */
public class VCard extends IQ { public class VCard extends IQ {
private static final String DEFAULT_MIME_TYPE = "image/jpeg";
/** /**
* Phone types: * Phone types:
* VOICE?, FAX?, PAGER?, MSG?, CELL?, VIDEO?, BBS?, MODEM?, ISDN?, PCS?, PREF? * VOICE?, FAX?, PAGER?, MSG?, CELL?, VIDEO?, BBS?, MODEM?, ISDN?, PCS?, PREF?
@ -93,7 +94,6 @@ public class VCard extends IQ {
private Map<String, String> homePhones = new HashMap<String, String>(); private Map<String, String> homePhones = new HashMap<String, String>();
private Map<String, String> workPhones = new HashMap<String, String>(); private Map<String, String> workPhones = new HashMap<String, String>();
/** /**
* Address types: * Address types:
* POSTAL?, PARCEL?, (DOM | INTL)?, PREF?, POBOX?, EXTADR?, STREET?, LOCALITY?, * POSTAL?, PARCEL?, (DOM | INTL)?, PREF?, POBOX?, EXTADR?, STREET?, LOCALITY?,
@ -357,7 +357,7 @@ public class VCard extends IQ {
* @param bytes the bytes of the avatar, or null to remove the avatar data * @param bytes the bytes of the avatar, or null to remove the avatar data
*/ */
public void setAvatar(byte[] bytes) { public void setAvatar(byte[] bytes) {
setAvatar(bytes, "image/jpeg"); setAvatar(bytes, DEFAULT_MIME_TYPE);
} }
/** /**
@ -390,6 +390,16 @@ public class VCard extends IQ {
photoMimeType = mimeType; photoMimeType = mimeType;
} }
/**
* Set the encoded avatar string. This is used by the provider.
*
* @param encodedAvatar the encoded avatar string.
* @deprecated Use {@link #setAvatar(String, String)} instead.
*/
public void setEncodedImage(String encodedAvatar) {
setAvatar(encodedAvatar, DEFAULT_MIME_TYPE);
}
/** /**
* Return the byte representation of the avatar(if one exists), otherwise returns null if * Return the byte representation of the avatar(if one exists), otherwise returns null if
* no avatar could be found. * no avatar could be found.