Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2013-08-31 09:55:27 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2013-08-31 09:55:27 (GMT) |
| commit | 41bb9db24566f15d60d2522eaea6f00cbaabdf4a (patch) | |
| tree | bf2c6518bc9a5ee1d37f3283af7589385fb7dd2f /Swiften/Parser/PayloadParsers/VCardParser.cpp | |
| parent | 2f8ef07f7ac166ee073510fa7fca3c2b353cb9c2 (diff) | |
| download | swift-41bb9db24566f15d60d2522eaea6f00cbaabdf4a.zip swift-41bb9db24566f15d60d2522eaea6f00cbaabdf4a.tar.bz2 | |
Move newline handling for Base64 to VCard parser. IBB's Base64 won't have newlines.
Change-Id: I700949ea572421972b53539b83c4d04ff4d368f0
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swiften/Parser/PayloadParsers/VCardParser.cpp')
| -rw-r--r-- | Swiften/Parser/PayloadParsers/VCardParser.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Swiften/Parser/PayloadParsers/VCardParser.cpp b/Swiften/Parser/PayloadParsers/VCardParser.cpp index 620a307..0028411 100644 --- a/Swiften/Parser/PayloadParsers/VCardParser.cpp +++ b/Swiften/Parser/PayloadParsers/VCardParser.cpp @@ -81,6 +81,8 @@ void VCardParser::handleEndElement(const std::string& element, const std::string getPayloadInternal()->setPhotoType(currentText_); } else if (elementHierarchy == "/vCard/PHOTO/BINVAL") { + currentText_.erase(std::remove(currentText_.begin(), currentText_.end(), '\n'), currentText_.end()); + currentText_.erase(std::remove(currentText_.begin(), currentText_.end(), '\r'), currentText_.end()); getPayloadInternal()->setPhoto(Base64::decode(currentText_)); } else if (elementHierarchy == "/vCard/PHOTO") { |