Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-06-09 10:08:25 (GMT) |
|---|---|---|
| committer | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-06-14 13:30:22 (GMT) |
| commit | 2180f81bd45045021d98c3a2e0649f10680596f9 (patch) | |
| tree | 872db3fdeb890a232b5a1dc3b823a1e6692b5aa0 /src/com/isode/stroke/elements | |
| parent | 9518f8b9d6924e95e4ad839f40866560bd7a7878 (diff) | |
| download | stroke-2180f81bd45045021d98c3a2e0649f10680596f9.zip stroke-2180f81bd45045021d98c3a2e0649f10680596f9.tar.bz2 | |
Add Avatar Functionality.
Adds AvatarManager, AvatarManagerImpl, AvatarStorage and different AvatarProviders including DummyAvatarProvider, NullAvatarProvider and OfflineAvatarProvider.
Also adds VCardAvatarManager and VCardUpdateAvatarManager.
Updates VCard Element, so that it does not return null on calling getPhoto() and thereby produce Null Pointer Exceptions.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Tests are added for AvatarManagerImpl, VCardAvatarManager and VCardUpdateAvatarManager, which passes.
Tests for CombinedAvatarProvider will be added soon.
Change-Id: Ia6c0f82ae496427dc0cd11841487f6c53fd0fe1c
Diffstat (limited to 'src/com/isode/stroke/elements')
| -rw-r--r-- | src/com/isode/stroke/elements/VCard.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/isode/stroke/elements/VCard.java b/src/com/isode/stroke/elements/VCard.java index f9b294b..91a9093 100644 --- a/src/com/isode/stroke/elements/VCard.java +++ b/src/com/isode/stroke/elements/VCard.java @@ -132,7 +132,14 @@ public class VCard extends Payload implements Serializable { public final String getNickname() { return nick_; } public void setPhoto(final ByteArray photo) { photo_ = photo; } - public final ByteArray getPhoto() { return photo_; } + public final ByteArray getPhoto() { + if(this.photo_ != null) { + return photo_; + } + else { + return new ByteArray(); + } + } public void setPhotoType(final String photoType) { photoType_ = photoType; } public final String getPhotoType() { return photoType_; } |