mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-20 20:48:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed charset conversion function from 'any to any' to 'any to utf8'

Browse source 
Update bctoolbox for this commit to work
This commit is contained in:
Mickaël Turnel 2018-05-28 10:26:43 +02:00
parent a9233ebd43
commit 2ae73cb39c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linphone/utils/utils.h
View file

@ -129,7 +129,7 @@ namespace Utils {
LINPHONE_PUBLIC std::string localeToUtf8 (const std::string &str);
LINPHONE_PUBLIC std::string utf8ToLocale (const std::string &str);
LINPHONE_PUBLIC std::string convertString (const std::string &str, const std::string &from, const std::string &to);
LINPHONE_PUBLIC std::string convertAnyToUtf8 (const std::string &str, const std::string &encoding);
}
LINPHONE_END_NAMESPACE

2
src/chat/chat-message/chat-message.cpp
View file

@ -457,7 +457,7 @@ static void forceUtf8Content (Content &content) {
charset = charset.substr(begin, end - begin);
if (Utils::stringToLower(charset) != "utf-8") {
string utf8Body = Utils::convertString(content.getBodyAsUtf8String(), charset, "UTF-8");
string utf8Body = Utils::convertAnyToUtf8(content.getBodyAsUtf8String(), charset);
if (!utf8Body.empty()) {
// TODO: use move operator if possible in the future!
content.setBodyFromUtf8(utf8Body);

4
src/utils/utils.cpp
View file

@ -243,8 +243,8 @@ string Utils::utf8ToLocale (const string &str) {
return localeStr;
}
string Utils::convertString (const string &str, const string &from, const string &to) {
char *cStr = bctbx_convert_from_to(str.c_str(), from.c_str(), to.c_str());
string Utils::convertAnyToUtf8 (const string &str, const string &encoding) {
char *cStr = bctbx_convert_any_to_utf8(str.c_str(), encoding.c_str());
string convertedStr = cStringToCppString(cStr);
bctbx_free(cStr);
return convertedStr;