From 0e6660025e4d8b257d5548da18809a0919328a36 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksandermj@chromium.org>
Date: Tue, 13 Sep 2022 10:45:22 +0000
Subject: [PATCH] libmm-glib,common: add helpers to build printable strings

---
 libmm-glib/mm-common-helpers.c | 39 ++++++++++++++++++++++++++++++++++
 libmm-glib/mm-common-helpers.h |  7 ++++++
 src/mm-log.c                   |  6 +++---
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/libmm-glib/mm-common-helpers.c b/libmm-glib/mm-common-helpers.c
index 5f3af4ac..de49136d 100644
--- a/libmm-glib/mm-common-helpers.c
+++ b/libmm-glib/mm-common-helpers.c
@@ -1998,6 +1998,45 @@ mm_sms_delivery_state_get_string_extended (guint delivery_state)
     return mm_sms_delivery_state_get_string ((MMSmsDeliveryState)delivery_state);
 }
 
+/*****************************************************************************/
+
+const gchar *
+mm_common_str_boolean (gboolean value)
+{
+    return value ? "yes" : "no";
+}
+
+const gchar *
+mm_common_str_personal_info (const gchar *str,
+                             gboolean     show_personal_info)
+{
+    static const gchar *hidden_personal_info = "###";
+
+    return show_personal_info ? str : hidden_personal_info;
+}
+
+void
+mm_common_str_array_human_keys (GPtrArray *array)
+{
+    guint i;
+
+    /* Transforms from:
+     *   strings-as-keys: value...
+     * Into:
+     *   strings as keys: value...
+     */
+    for (i = 0; i < array->len; i++) {
+        gchar *str;
+        guint j;
+
+        str = g_ptr_array_index (array, i);
+        for (j = 0; str[j] && str[j] != ':'; j++) {
+            if (str[j] == '-')
+                str[j] = ' ';
+        }
+    }
+}
+
 /*****************************************************************************/
 /* DBus error handling */
 
diff --git a/libmm-glib/mm-common-helpers.h b/libmm-glib/mm-common-helpers.h
index a92d5b58..6ff89e21 100644
--- a/libmm-glib/mm-common-helpers.h
+++ b/libmm-glib/mm-common-helpers.h
@@ -164,6 +164,13 @@ GVariant *mm_common_oma_pending_network_initiated_sessions_array_to_variant  (co
 GVariant *mm_common_oma_pending_network_initiated_sessions_garray_to_variant (GArray                                    *array);
 GVariant *mm_common_build_oma_pending_network_initiated_sessions_default     (void);
 
+/******************************************************************************/
+
+const gchar *mm_common_str_boolean          (gboolean     value);
+const gchar *mm_common_str_personal_info    (const gchar *str,
+                                             gboolean     show_personal_info);
+void         mm_common_str_array_human_keys (GPtrArray   *array);
+
 /******************************************************************************/
 /* Common parsers */
 
diff --git a/src/mm-log.c b/src/mm-log.c
index a1c1aa4a..d5b80d90 100644
--- a/src/mm-log.c
+++ b/src/mm-log.c
@@ -28,6 +28,8 @@
 
 #include <ModemManager.h>
 #include <mm-errors-types.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
 
 #if defined WITH_QMI
 #include <libqmi-glib.h>
@@ -421,7 +423,5 @@ mm_log_shutdown (void)
 const gchar *
 mm_log_str_personal_info (const gchar *str)
 {
-    static const gchar *hidden_personal_info = "###";
-
-    return personal_info ? str : hidden_personal_info;
+    return mm_common_str_personal_info (str, personal_info);
 }