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

api: new `Sms.DeliveryReportRequest' property

Browse Source 
Also allowing the 'delivery-report-request' key in the `Messaging.CreateSms()'
method.
This commit is contained in:
Aleksander Morgado
2012-09-14 07:05:24 +02:00
parent b42b5795e3
commit 1c119be834
6 changed files with 128 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-sms-part.c
+15 -2
View File
@@ -269,6 +269,7 @@ struct _MMSmsPart {
guint data_coding_scheme;
guint class;
guint validity;
gboolean delivery_report_request;
gboolean should_concat;
guint concat_reference;
@@ -342,6 +343,8 @@ PART_GET_FUNC (guint, class)
PART_SET_FUNC (guint, class)
PART_GET_FUNC (guint, validity)
PART_SET_FUNC (guint, validity)
PART_GET_FUNC (gboolean, delivery_report_request)
PART_SET_FUNC (gboolean, delivery_report_request)
PART_GET_FUNC (guint, concat_reference)
@@ -759,8 +762,18 @@ mm_sms_part_get_submit_pdu (MMSmsPart *part,
pdu[offset] |= 0x40; /* UDHI */
}
/* TODO: Request status only in last part */
pdu[offset++] |= 0x01; /* TP-MTI = SMS-SUBMIT */
/* Delivery report requested in singlepart messages or in the last PDU of
* multipart messages */
if (part->delivery_report_request &&
(!part->concat_sequence ||
part->concat_max == part->concat_sequence)) {
mm_dbg (" requesting delivery report...");
pdu[offset] |= 0x20;
}
/* TP-MTI = SMS-SUBMIT */
pdu[offset++] |= 0x01;
/* ----------- TP-MR (1 byte) ----------- */
src/mm-sms-part.h
+4
View File
@@ -96,6 +96,10 @@ guint mm_sms_part_get_validity (MMSmsPart *part);
void mm_sms_part_set_validity (MMSmsPart *part,
guint validity);
gboolean mm_sms_part_get_delivery_report_request (MMSmsPart *part);
void mm_sms_part_set_delivery_report_request (MMSmsPart *part,
gboolean delivery_report_request);
guint mm_sms_part_get_concat_reference (MMSmsPart *part);
void mm_sms_part_set_concat_reference (MMSmsPart *part,
guint concat_reference);
src/mm-sms.c
+4
View File
@@ -1183,6 +1183,8 @@ assemble_sms (MMSms *self,
"number", mm_sms_part_get_number (sorted_parts[0]),
"timestamp", mm_sms_part_get_timestamp (sorted_parts[0]),
"validity", mm_sms_part_get_validity (sorted_parts[0]),
/* delivery report request usually set in the last part only */
"delivery-report-request", mm_sms_part_get_delivery_report_request (sorted_parts[self->priv->max_parts - 1]),
NULL);
g_string_free (fulltext, TRUE);
@@ -1397,6 +1399,7 @@ mm_sms_new_from_properties (MMBaseModem *modem,
mm_sms_part_set_smsc (part, mm_sms_properties_get_smsc (properties));
mm_sms_part_set_validity (part, mm_sms_properties_get_validity (properties));
mm_sms_part_set_class (part, mm_sms_properties_get_class (properties));
mm_sms_part_set_delivery_report_request (part, mm_sms_properties_get_delivery_report_request (properties));
mm_sms_part_set_concat_reference (part, reference);
mm_sms_part_set_concat_sequence (part, i + 1);
mm_sms_part_set_concat_max (part, n_parts);
@@ -1437,6 +1440,7 @@ mm_sms_new_from_properties (MMBaseModem *modem,
mm_sms_part_set_smsc (part, mm_sms_properties_get_smsc (properties));
mm_sms_part_set_validity (part, mm_sms_properties_get_validity (properties));
mm_sms_part_set_class (part, mm_sms_properties_get_class (properties));
mm_sms_part_set_delivery_report_request (part, mm_sms_properties_get_delivery_report_request (properties));
return mm_sms_singlepart_new (modem,
MM_SMS_STATE_UNKNOWN,