Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-09-05 13:30:28 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-09-05 13:30:28 (GMT) |
| commit | e8dbe2e2b78cd5e4a66e2e580e12d05b2e69b120 (patch) | |
| tree | afe7e15f393ac2a5572e9b5cc16947840c6fa1e9 /Swiften/Avatars/VCardUpdateAvatarManager.cpp | |
| parent | 89f18c8af344fc94bb5cf19035c74385d1c9df9c (diff) | |
| download | swift-e8dbe2e2b78cd5e4a66e2e580e12d05b2e69b120.zip swift-e8dbe2e2b78cd5e4a66e2e580e12d05b2e69b120.tar.bz2 | |
Do not store null VCard avatars.
Diffstat (limited to 'Swiften/Avatars/VCardUpdateAvatarManager.cpp')
| -rw-r--r-- | Swiften/Avatars/VCardUpdateAvatarManager.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Swiften/Avatars/VCardUpdateAvatarManager.cpp b/Swiften/Avatars/VCardUpdateAvatarManager.cpp index dbc0b9b..24abfa1 100644 --- a/Swiften/Avatars/VCardUpdateAvatarManager.cpp +++ b/Swiften/Avatars/VCardUpdateAvatarManager.cpp @@ -52,9 +52,14 @@ void VCardUpdateAvatarManager::handleVCardChanged(const JID& from, VCard::ref vC return; } - String hash = Hexify::hexify(SHA1::getHash(vCard->getPhoto())); - avatarStorage_->addAvatar(hash, vCard->getPhoto()); - setAvatarHash(from, hash); + if (vCard->getPhoto().isEmpty()) { + setAvatarHash(from, ""); + } + else { + String hash = Hexify::hexify(SHA1::getHash(vCard->getPhoto())); + avatarStorage_->addAvatar(hash, vCard->getPhoto()); + setAvatarHash(from, hash); + } } void VCardUpdateAvatarManager::setAvatarHash(const JID& from, const String& hash) { |