api,introspection: update 'Validity' property in the SMS interface

We don't want to support only 'relative' validity, so don't assume that the
Validity property will always be a uint32 value.

Instead, we define the Validity propery as '(uv)' tuple, where the first value
(a MMSmsValidityType) specifies the type of validity, and the second value is
a variant formatted accordingly to what the validity type specifies (e.g. a
uint32 value if the type is MM_SMS_VALIDITY_TYPE_RELATIVE).

4 files changed, 42 insertions, 13 deletions

diff --git a/src/mm-sms-part.c b/src/mm-sms-part.c
index ffe15a99..e68a25b6 100644
--- a/src/mm-sms-part.c
+++ b/src/mm-sms-part.c
@@ -326,7 +326,7 @@ struct _MMSmsPart {
     MMSmsEncoding encoding;
     GByteArray *data;
     guint class;
-    guint validity;
+    guint validity_relative;
     gboolean delivery_report_request;
     guint message_reference;
     /* NOT a MMSmsDeliveryState, which just includes the known values */
@@ -405,8 +405,8 @@ PART_GET_FUNC (MMSmsEncoding, encoding)
 PART_SET_FUNC (MMSmsEncoding, encoding)
 PART_GET_FUNC (guint, class)
 PART_SET_FUNC (guint, class)
-PART_GET_FUNC (guint, validity)
-PART_SET_FUNC (guint, validity)
+PART_GET_FUNC (guint, validity_relative)
+PART_SET_FUNC (guint, validity_relative)
 PART_GET_FUNC (gboolean, delivery_report_request)
 PART_SET_FUNC (gboolean, delivery_report_request)
 PART_GET_FUNC (guint, message_reference)
@@ -655,8 +655,8 @@ mm_sms_part_new_from_binary_pdu (guint index,
             switch (validity_format) {
             case 0x10:
                 mm_dbg ("  validity available, format relative");
-                mm_sms_part_set_validity (sms_part,
-                                          relative_to_validity (pdu[offset]));
+                mm_sms_part_set_validity_relative (sms_part,
+                                                   relative_to_validity (pdu[offset]));
                 offset++;
                 break;
             case 0x08:
@@ -972,7 +972,7 @@ mm_sms_part_get_submit_pdu (MMSmsPart *part,
     pdu[offset] = 0;
 
     /* TP-VP present; format RELATIVE */
-    if (part->validity > 0) {
+    if (part->validity_relative > 0) {
         mm_dbg ("  adding validity to PDU...");
         pdu[offset] |= 0x10;
     }
@@ -1034,8 +1034,8 @@ mm_sms_part_get_submit_pdu (MMSmsPart *part,
     /* ----------- TP-Validity-Period (1 byte): 4 days ----------- */
     /* Only if TP-VPF was set in first byte */
 
-    if (part->validity > 0)
-        pdu[offset++] = validity_to_relative (part->validity);
+    if (part->validity_relative > 0)
+        pdu[offset++] = validity_to_relative (part->validity_relative);
 
     /* ----------- TP-User-Data-Length ----------- */
     /* Set to zero initially, and keep a ptr for easy access later */
diff --git a/src/mm-sms-part.h b/src/mm-sms-part.h
index 4517a7a7..8e7cdd92 100644
--- a/src/mm-sms-part.h
+++ b/src/mm-sms-part.h
@@ -100,8 +100,8 @@ guint             mm_sms_part_get_class              (MMSmsPart *part);
 void              mm_sms_part_set_class              (MMSmsPart *part,
                                                       guint class);
 
-guint             mm_sms_part_get_validity           (MMSmsPart *part);
-void              mm_sms_part_set_validity           (MMSmsPart *part,
+guint             mm_sms_part_get_validity_relative  (MMSmsPart *part);
+void              mm_sms_part_set_validity_relative  (MMSmsPart *part,
                                                       guint validity);
 
 guint             mm_sms_part_get_delivery_state (MMSmsPart *part);
diff --git a/src/mm-sms.c b/src/mm-sms.c
index c540692e..f0a08e69 100644
--- a/src/mm-sms.c
+++ b/src/mm-sms.c
@@ -73,6 +73,29 @@ struct _MMSmsPrivate {
 
 /*****************************************************************************/
 
+static guint
+get_validity_relative (GVariant *tuple)
+{
+    guint type;
+    GVariant *value;
+    guint value_integer = 0;
+
+    if (!tuple)
+        return 0;
+
+    g_variant_get (tuple, "(ub)", &type, &value);
+
+    if (type == MM_SMS_VALIDITY_TYPE_RELATIVE)
+        value_integer = g_variant_get_uint32 (value);
+    else
+        /* Currently not supported other than relative */
+        g_warn_if_reached ();
+
+    g_variant_unref (value);
+
+    return value_integer;
+}
+
 static gboolean
 generate_submit_pdus (MMSms *self,
                       GError **error)
@@ -172,7 +195,7 @@ generate_submit_pdus (MMSms *self,
         mm_sms_part_set_encoding (part, encoding);
         mm_sms_part_set_number (part, mm_gdbus_sms_get_number (MM_GDBUS_SMS (self)));
         mm_sms_part_set_smsc (part, mm_gdbus_sms_get_smsc (MM_GDBUS_SMS (self)));
-        mm_sms_part_set_validity (part, mm_gdbus_sms_get_validity (MM_GDBUS_SMS (self)));
+        mm_sms_part_set_validity_relative (part, get_validity_relative (mm_gdbus_sms_get_validity (MM_GDBUS_SMS (self))));
         mm_sms_part_set_class (part, mm_gdbus_sms_get_class (MM_GDBUS_SMS (self)));
         mm_sms_part_set_delivery_report_request (part, mm_gdbus_sms_get_delivery_report_request (MM_GDBUS_SMS (self)));
 
@@ -1376,6 +1399,7 @@ assemble_sms (MMSms *self,
     MMSmsPart **sorted_parts;
     GString *fulltext;
     GByteArray *fulldata;
+    guint validity_relative;
 
     sorted_parts = g_new0 (MMSmsPart *, self->priv->max_parts);
 
@@ -1463,6 +1487,9 @@ assemble_sms (MMSms *self,
     /* If we got all parts, we also have the first one always */
     g_assert (sorted_parts[0] != NULL);
 
+    /* Prepare for validity tuple */
+    validity_relative = mm_sms_part_get_validity_relative (sorted_parts[0]);
+
     /* If we got everything, assemble the text! */
     g_object_set (self,
                   "pdu-type",  mm_sms_part_get_pdu_type (sorted_parts[0]),
@@ -1476,7 +1503,9 @@ assemble_sms (MMSms *self,
                   "smsc",      mm_sms_part_get_smsc (sorted_parts[0]),
                   "class",     mm_sms_part_get_class (sorted_parts[0]),
                   "number",    mm_sms_part_get_number (sorted_parts[0]),
-                  "validity",  mm_sms_part_get_validity (sorted_parts[0]),
+                  "validity",                (validity_relative ?
+                                              g_variant_new ("(uv)", MM_SMS_VALIDITY_TYPE_RELATIVE, g_variant_new_uint32 (validity_relative)) :
+                                              g_variant_new ("(uv)", MM_SMS_VALIDITY_TYPE_UNKNOWN, g_variant_new_boolean (FALSE))),
                   "timestamp",               mm_sms_part_get_timestamp (sorted_parts[0]),
                   "discharge-timestamp",     mm_sms_part_get_discharge_timestamp (sorted_parts[0]),
                   "delivery-state",          mm_sms_part_get_delivery_state (sorted_parts[0]),
diff --git a/src/tests/test-sms-part.c b/src/tests/test-sms-part.c
index 7d03f8f6..6a3f7183 100644
--- a/src/tests/test-sms-part.c
+++ b/src/tests/test-sms-part.c
@@ -536,7 +536,7 @@ common_test_create_pdu (const gchar *smsc,
         mm_sms_part_set_encoding (part, encoding);
     }
     if (validity > 0)
-        mm_sms_part_set_validity (part, validity);
+        mm_sms_part_set_validity_relative (part, validity);
     if (class > 0)
         mm_sms_part_set_class (part, class);