Changeset 3716

Timestamp:

12/21/07 14:00:39 (5 years ago)

Author:

chris

Message:

• src/phone-kit/moko-network.c: (gsmd_eventhandler): Send all delivery status events

• src/phone-kit/moko-sms-dbus.xml: Make delivery status report optional

• src/phone-kit/moko-sms.c: (on_incoming_ds), (on_send_sms), (moko_sms_send):
• src/phone-kit/moko-sms.h: Filter delivery status types correctly (hopefully), make delivery status report optional

Location:

trunk/src/target/OM-2007.2/applications/openmoko-dialer2

Files:

• ChangeLog (modified) (1 diff)
• src/phone-kit/moko-network.c (modified) (1 diff)
• src/phone-kit/moko-sms-dbus.xml (modified) (1 diff)
• src/phone-kit/moko-sms.c (modified) (6 diffs)
• src/phone-kit/moko-sms.h (modified) (1 diff)

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog

@@ +1 @@
+2007-12-21  Chris Lord  <chris@openedhand.com>
+
+        * src/phone-kit/moko-network.c: (gsmd_eventhandler):
+        Send all delivery status events
+
+        * src/phone-kit/moko-sms-dbus.xml:
+        Make delivery status report optional
+
+        * src/phone-kit/moko-sms.c: (on_incoming_ds), (on_send_sms),
+        (moko_sms_send):
+        * src/phone-kit/moko-sms.h:
+        Filter delivery status types correctly (hopefully), make delivery status
+        report optional
+
 2007-12-19  Chris Lord  <chris@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c

@@ -384 +384 @@
       struct gsmd_sms_list *sms = (struct gsmd_sms_list *) aux->data;
       
-      /* TODO: I'm not entirely sure of the spec when if 
-       *       storing an unsent message means it failed?
-       */
-      if (sms->payload.coding_scheme == LGSM_SMS_STO_SENT) {
-        for (l = priv->listeners; l; l = l->next) {
-          moko_listener_on_incoming_ds (MOKO_LISTENER (l->data), priv->handle,
-                                        sms);
-        }
+      for (l = priv->listeners; l; l = l->next) {
+        moko_listener_on_incoming_ds (MOKO_LISTENER (l->data), priv->handle,
+                                      sms);
       }
     } else {

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms-dbus.xml

@@ -9 +9 @@
     <arg type="s" name="number" />
     <arg type="s" name="message" />
+    <arg type="b" name="report" />
     <arg type="s" name="uid" direction="out" />
   </method>

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c

@@ -350 +350 @@
   MokoSmsPrivate *priv = moko_sms->priv;
 
-  if (sms->payload.coding_scheme == LGSM_SMS_STO_SENT) {
+  /* TODO: I'm not entirely sure of the spec when if 
+   *       storing an unsent message means it failed?
+   */
+  if (sms->stat == GSMD_SMS_STO_SENT) {
     gchar *ref = g_strdup_printf ("%d", sms->index);
     JanaStoreView *view = jana_store_get_view (priv->sms_store);
@@ -386 +389 @@
     } else {
       g_debug ("Sent message rejected");
+      jana_utils_component_remove_category (JANA_COMPONENT(priv->last_msg),
+                                            "Sent");
       jana_utils_component_remove_category (JANA_COMPONENT(priv->last_msg),
                                             "Sending");
@@ -603 +608 @@
 gboolean
 moko_sms_send (MokoSms *self, const gchar *number,
-               const gchar *message, gchar **uid, GError **error)
+               const gchar *message, gboolean report, gchar **uid,
+               GError **error)
 {
   PhoneKitNetworkStatus status;
@@ -638 +644 @@
   
   /* Ask for delivery report */
-  sms.ask_ds = 1;
+  sms.ask_ds = report ? 1 : 0;
   
   /* Set destination number */
@@ -694 +700 @@
   
   jana_note_set_body (note, message);
-  jana_component_set_categories (JANA_COMPONENT (note),
-    (const gchar *[]){ "Sending", NULL});
+  if (report) {
+    jana_component_set_categories (JANA_COMPONENT (note),
+                                   (const gchar *[]){ "Sending", NULL});
+  } else {
+    jana_component_set_categories (JANA_COMPONENT (note),
+                                   (const gchar *[]){ "Sent", NULL});
+  }
   
   jana_store_add_component (priv->sms_store,
@@ -703 +714 @@
   if (priv->last_msg) {
     g_warning ("Confirmation not received for last sent SMS, "
-      "delivery report will be lost.");
+               "any delivery reports for this message will be lost.");
     g_object_unref (priv->last_msg);
-    priv->last_msg = NULL;
   }
   priv->last_msg = note;

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.h

@@ -97 +97 @@
 gboolean
 moko_sms_send (MokoSms *self, const gchar *number,
-               const gchar *message, gchar **uid, GError **error);
+               const gchar *message, gboolean report, gchar **uid,
+               GError **error);
 
 G_END_DECLS