SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

charsets: use new bytearray_to_utf8() instead of hex_to_utf8()

Browse Source
This commit is contained in:
Aleksander Morgado
2021-02-23 11:35:11 +00:00
parent 5ea4a591a4
commit 395ab06c03
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem.c
+15 -5
View File
@@ -5905,15 +5905,25 @@ modem_3gpp_ussd_encode (MMIfaceModem3gppUssd *_self,
}
static gchar *
modem_3gpp_ussd_decode (MMIfaceModem3gppUssd *self,
const gchar *reply,
GError **error)
modem_3gpp_ussd_decode (MMIfaceModem3gppUssd *self,
const gchar *reply,
GError **error)
{
MMBroadbandModem *broadband = MM_BROADBAND_MODEM (self);
MMBroadbandModem *broadband = MM_BROADBAND_MODEM (self);
guint8 *bin = NULL;
gsize bin_len = 0;
g_autoptr(GByteArray) barray = NULL;
bin = (guint8 *) mm_utils_hexstr2bin (reply, -1, &bin_len, error);
if (!bin) {
g_prefix_error (error, "Couldn't convert HEX string to binary: ");
return NULL;
}
barray = g_byte_array_new_take (bin, bin_len);
/* Decode from current charset (as per AT+CSCS, which is what most modems
* (except for Huawei it seems) will ask for. */
return mm_modem_charset_hex_to_utf8 (reply, broadband->priv->modem_current_charset);
return mm_modem_charset_bytearray_to_utf8 (barray, broadband->priv->modem_current_charset, FALSE, error);
}
/*****************************************************************************/