cinterion: radio/band single scfg line: no variance

the AT^SCFG="Radio/Band" command does not return a different answer
for different charsets.
This code was working previously because the charset was left to default (GSM)
at the time of this operation, and therefore the string was unchanged anyway.

2 files changed, 2 insertions, 29 deletions

diff --git a/plugins/cinterion/mm-modem-helpers-cinterion.c b/plugins/cinterion/mm-modem-helpers-cinterion.c
index 9041960f..095e396c 100644
--- a/plugins/cinterion/mm-modem-helpers-cinterion.c
+++ b/plugins/cinterion/mm-modem-helpers-cinterion.c
@@ -270,13 +270,8 @@ mm_cinterion_parse_scfg_test (const gchar                 *response,
         *format = MM_CINTERION_RADIO_BAND_FORMAT_SINGLE;
 
         maxbandstr = mm_get_string_unquoted_from_match_info (match_info1, 2);
-        if (maxbandstr) {
-            /* Handle charset conversion if the number is given in UCS2 */
-            if (charset != MM_MODEM_CHARSET_UNKNOWN)
-                maxbandstr = mm_charset_take_and_convert_to_utf8 (maxbandstr, charset);
-
+        if (maxbandstr)
             mm_get_uint_from_str (maxbandstr, &maxband);
-        }
 
         if (maxband == 0) {
             inner_error = g_error_new (MM_CORE_ERROR,
@@ -419,12 +414,8 @@ mm_cinterion_parse_scfg_response (const gchar                  *response,
             guint current = 0;
 
             currentstr = mm_get_string_unquoted_from_match_info (match_info, 1);
-            if (currentstr) {
-                /* Handle charset conversion if the number is given in UCS2 */
-                if (charset != MM_MODEM_CHARSET_UNKNOWN)
-                    currentstr = mm_charset_take_and_convert_to_utf8 (currentstr, charset);
+            if (currentstr)
                 mm_get_uint_from_str (currentstr, &current);
-            }
 
             if (current == 0) {
                 inner_error = g_error_new (MM_CORE_ERROR,
diff --git a/plugins/cinterion/tests/test-modem-helpers-cinterion.c b/plugins/cinterion/tests/test-modem-helpers-cinterion.c
index b23a356e..35123283 100644
--- a/plugins/cinterion/tests/test-modem-helpers-cinterion.c
+++ b/plugins/cinterion/tests/test-modem-helpers-cinterion.c
@@ -510,23 +510,6 @@ test_scfg_response_2g (void)
 }
 
 static void
-test_scfg_response_2g_ucs2 (void)
-{
-    GArray *expected_bands;
-    MMModemBand single;
-    const gchar *response =
-        "^SCFG: \"Radio/Band\",\"0031\",\"0031\"\r\n"
-        "\r\n";
-
-    expected_bands = g_array_sized_new (FALSE, FALSE, sizeof (MMModemBand), 9);
-    single = MM_MODEM_BAND_EGSM,  g_array_append_val (expected_bands, single);
-
-    common_test_scfg_response (response, MM_MODEM_CHARSET_UCS2, expected_bands, MM_CINTERION_MODEM_FAMILY_DEFAULT, MM_CINTERION_RADIO_BAND_FORMAT_SINGLE);
-
-    g_array_unref (expected_bands);
-}
-
-static void
 test_scfg_response_3g (void)
 {
     GArray *expected_bands;
@@ -1629,7 +1612,6 @@ int main (int argc, char **argv)
     g_test_add_func ("/MM/cinterion/scfg/alas5",              test_scfg_alas5);
     g_test_add_func ("/MM/cinterion/scfg/response/3g",        test_scfg_response_3g);
     g_test_add_func ("/MM/cinterion/scfg/response/2g",        test_scfg_response_2g);
-    g_test_add_func ("/MM/cinterion/scfg/response/2g/ucs2",   test_scfg_response_2g_ucs2);
     g_test_add_func ("/MM/cinterion/scfg/response/pls62/gsm", test_scfg_response_pls62_gsm);
     g_test_add_func ("/MM/cinterion/scfg/response/pls62/ucs2",test_scfg_response_pls62_ucs2);
     g_test_add_func ("/MM/cinterion/scfg/response/alas5",     test_scfg_response_alas5);