Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2019-11-19 13:36:05 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2019-11-19 13:58:45 (GMT) |
| commit | 261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch) | |
| tree | c7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swiften/Avatars/VCardUpdateAvatarManager.cpp | |
| parent | 697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff) | |
| download | swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2 | |
Remove std::endl from SWIFT_LOG calls
The std::endl is now added by ~Log, but only for output to stderr or a
log file. Calls to the Android logging system or manually set callbacks
will not include the newline in the logging output.
JIRA: SWIFT-430
Test-Information:
Unit tests pass on Debian 9
Checked that running Swift with logging to stderr still had a newline.
Change-Id: I096fdba78a3b8f87db2097951c28c528592183e8
Diffstat (limited to 'Swiften/Avatars/VCardUpdateAvatarManager.cpp')
| -rw-r--r-- | Swiften/Avatars/VCardUpdateAvatarManager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Avatars/VCardUpdateAvatarManager.cpp b/Swiften/Avatars/VCardUpdateAvatarManager.cpp index 349af2f..d04c13c 100644 --- a/Swiften/Avatars/VCardUpdateAvatarManager.cpp +++ b/Swiften/Avatars/VCardUpdateAvatarManager.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2018 Isode Limited. | 2 | * Copyright (c) 2010-2019 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -33,13 +33,13 @@ void VCardUpdateAvatarManager::handlePresenceReceived(std::shared_ptr<Presence> | |||
| 33 | } | 33 | } |
| 34 | JID from = getAvatarJID(presence->getFrom()); | 34 | JID from = getAvatarJID(presence->getFrom()); |
| 35 | if (update->getPhotoHash().size() != 40) { | 35 | if (update->getPhotoHash().size() != 40) { |
| 36 | SWIFT_LOG(debug) << "Invalid vCard avatar photo hash length. Must be hex-encoded SHA-1, i.e. 40 characters." << std::endl; | 36 | SWIFT_LOG(debug) << "Invalid vCard avatar photo hash length. Must be hex-encoded SHA-1, i.e. 40 characters."; |
| 37 | return; | 37 | return; |
| 38 | } | 38 | } |
| 39 | if (getAvatarHash(from) == update->getPhotoHash()) { | 39 | if (getAvatarHash(from) == update->getPhotoHash()) { |
| 40 | return; | 40 | return; |
| 41 | } | 41 | } |
| 42 | SWIFT_LOG(debug) << "Updated hash: " << from << " -> " << update->getPhotoHash() << std::endl; | 42 | SWIFT_LOG(debug) << "Updated hash: " << from << " -> " << update->getPhotoHash(); |
| 43 | if (avatarStorage_->hasAvatar(update->getPhotoHash())) { | 43 | if (avatarStorage_->hasAvatar(update->getPhotoHash())) { |
| 44 | setAvatarHash(from, update->getPhotoHash()); | 44 | setAvatarHash(from, update->getPhotoHash()); |
| 45 | } | 45 | } |
| @@ -50,7 +50,7 @@ void VCardUpdateAvatarManager::handlePresenceReceived(std::shared_ptr<Presence> | |||
| 50 | 50 | ||
| 51 | void VCardUpdateAvatarManager::handleVCardChanged(const JID& from, VCard::ref vCard) { | 51 | void VCardUpdateAvatarManager::handleVCardChanged(const JID& from, VCard::ref vCard) { |
| 52 | if (!vCard) { | 52 | if (!vCard) { |
| 53 | SWIFT_LOG(debug) << "Missing element: " << from << ": null vcard payload" << std::endl; | 53 | SWIFT_LOG(debug) << "Missing element: " << from << ": null vcard payload"; |
| 54 | return; | 54 | return; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| @@ -67,7 +67,7 @@ void VCardUpdateAvatarManager::handleVCardChanged(const JID& from, VCard::ref vC | |||
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | void VCardUpdateAvatarManager::setAvatarHash(const JID& from, const std::string& hash) { | 69 | void VCardUpdateAvatarManager::setAvatarHash(const JID& from, const std::string& hash) { |
| 70 | SWIFT_LOG(debug) << "Updating hash: " << from << " -> " << hash << std::endl; | 70 | SWIFT_LOG(debug) << "Updating hash: " << from << " -> " << hash; |
| 71 | avatarHashes_[from] = hash; | 71 | avatarHashes_[from] = hash; |
| 72 | onAvatarChanged(from); | 72 | onAvatarChanged(from); |
| 73 | } | 73 | } |