Changeset 3453

Timestamp:

11/20/07 15:00:44 (6 years ago)

Author:

chris

Message:

• src/phone-kit/moko-dialer-sms.c: (moko_dialer_sms_finalize), (store_sms), (gsmd_eventhandler), (sms_msghandler), (net_msghandler), (opened_cb), (moko_dialer_sms_send): Add more debugging, get own phone number correctly

Location:

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

Files:

• ChangeLog (modified) (1 diff)
• src/phone-kit/moko-dialer-sms.c (modified) (10 diffs)

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

@@ +1 @@
+2007-11-20  Chris Lord  <chris@openedhand.com>
+
+        * src/phone-kit/moko-dialer-sms.c: (moko_dialer_sms_finalize),
+        (store_sms), (gsmd_eventhandler), (sms_msghandler),
+        (net_msghandler), (opened_cb), (moko_dialer_sms_send):
+        Add more debugging, get own phone number correctly
+
 2007-11-19  Chris Lord  <chris@openedhand.com>
 

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

@@ -32 +32 @@
         JanaNote *last_msg;
         MokoDialerSMSSource *source;
+        gchar *own_number;
 };
 
@@ -67 +68 @@
         
         g_source_destroy ((GSource *)priv->source);
+        g_free (priv->own_number);
         lgsm_exit (priv->handle);
 
@@ -133 +135 @@
         switch (sms->payload.coding_scheme) {
             case ALPHABET_DEFAULT :
-                message = g_malloc (GSMD_SMS_DATA_MAXLEN);
+                g_debug ("Decoding 7-bit ASCII message");
+                message = g_malloc0 (GSMD_SMS_DATA_MAXLEN);
                 unpacking_7bit_character (
                         &sms->payload, message);
@@ -139 +142 @@
             case ALPHABET_8BIT :
                 /* TODO: Verify: Is this encoding just UTF-8? */
+                g_debug ("Decoding UTF-8 message");
                 message = g_strdup (sms->payload.data);
                 break;
             case ALPHABET_UCS2 :
+                g_debug ("Decoding UCS-2 message");
                 message = g_utf16_to_utf8 ((const gunichar2 *)
                         sms->payload.data, sms->payload.length,
@@ -163 +168 @@
                 g_free (author);
                 
-                /* TODO: Normalise number necessary? */
-                recipient = g_strdup_printf ("%d",
-                        lgsm_get_subscriber_num (priv->handle));
-                jana_note_set_recipient (note, recipient);
-                g_free (recipient);
+                jana_note_set_recipient (note, priv->own_number);
                 
                 jana_note_set_body (note, message);
@@ -202 +203 @@
                         struct gsmd_sms_list * sms =
                                 (struct gsmd_sms_list *)aux->data;
+                        g_debug ("Message inline");
                         store_sms (moko_dialer_sms_get_default (), sms);
                 } else {
+                        g_debug ("Message stored on SIM, reading...");
                         lgsm_sms_read (priv->handle, aux->u.sms.index);
                 }
@@ -278 +281 @@
                 g_debug ("Storing message on SIM");
                 store_sms (sms, sms_list);
-        }
+        } else {
+                return -EINVAL;
+        }
+        
+        return 0;
+}
+
+static int
+net_msghandler (struct lgsm_handle *lh, struct gsmd_msg_hdr *gmh)
+{
+        MokoDialerSMS *sms = moko_dialer_sms_get_default ();
+        MokoDialerSMSPrivate *priv = SMS_PRIVATE (sms);
+
+        const struct gsmd_own_number *num = (struct gsmd_own_number *)
+                ((void *) gmh + sizeof(*gmh));
+
+        if (gmh->msg_subtype != GSMD_NETWORK_GET_NUMBER) return -EINVAL;
+        
+        g_free (priv->own_number);
+        
+        /* TODO: Normalise number necessary? */
+        priv->own_number = g_strdup (num->addr.number);
+        g_debug ("Got phone number: %s", priv->own_number);
         
         return 0;
@@ -346 +371 @@
         lgsm_register_handler (priv->handle, GSMD_MSG_SMS, &sms_msghandler);
         
-        /* List all messages to move to journal */
-        lgsm_sms_list (priv->handle, GSMD_SMS_ALL);
+        /* Connect network message handler (to get phone number) */
+        lgsm_register_handler (priv->handle, GSMD_MSG_NETWORK, &net_msghandler);
         
         /* Start polling for events */
@@ -358 +383 @@
         g_source_add_poll ((GSource*)priv->source, &priv->source->pollfd);
         g_source_attach ((GSource*)priv->source, NULL);
+
+        /* Get phone number */
+        lgsm_get_subscriber_num (priv->handle);
+        
+        /* List all messages to move to journal */
+        lgsm_sms_list (priv->handle, GSMD_SMS_ALL);
 }
 
@@ -457 +488 @@
         note = jana_ecal_note_new ();
         jana_note_set_recipient (note, number);
-        
-        /* TODO: Normalise number necessary? */
-        author = g_strdup_printf ("%d",
-                lgsm_get_subscriber_num (priv->handle));
-        jana_note_set_author (note, author);
-        g_free (author);
+        jana_note_set_author (note, priv->own_number);
         
         jana_note_set_body (note, message);