diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-12-21 14:28:08 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2021-02-23 11:35:11 +0000 |
| commit | 5ea4a591a40748c5be5f9f4b14ac4f7a09fe2857 (patch) | |
| tree | 431edd63b9a0499714a42a306706b43c4b87d02d /src/mm-sms-part-3gpp.c | |
| parent | 033e174e445ff7606ea43191a4a5c141413e10e2 (diff) | |
charsets: use new bytearray_to_utf8() instead of byte_array_to_utf8()
Diffstat (limited to 'src/mm-sms-part-3gpp.c')
| -rw-r--r-- | src/mm-sms-part-3gpp.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mm-sms-part-3gpp.c b/src/mm-sms-part-3gpp.c index 29b49a68..fbf8e114 100644 --- a/src/mm-sms-part-3gpp.c +++ b/src/mm-sms-part-3gpp.c @@ -264,17 +264,14 @@ sms_decode_text (const guint8 *text, return utf8; } + /* Always assume UTF-16 instead of UCS-2! */ if (encoding == MM_SMS_ENCODING_UCS2) { g_autoptr(GByteArray) bytearray = NULL; gchar *utf8; bytearray = g_byte_array_append (g_byte_array_sized_new (len), (const guint8 *)text, len); - /* Always assume UTF-16 instead of UCS-2! */ - utf8 = mm_modem_charset_byte_array_to_utf8 (bytearray, MM_MODEM_CHARSET_UTF16); - if (!utf8) - g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, - "Couldn't convert SMS part contents from UTF-16BE to UTF-8: not decoding any text"); - else + utf8 = mm_modem_charset_bytearray_to_utf8 (bytearray, MM_MODEM_CHARSET_UTF16, FALSE, error); + if (utf8) mm_obj_dbg (log_object, "converted SMS part text from UTF-16BE to UTF-8: %s", utf8); return utf8; } |