Changeset 3512

Timestamp:

11/26/07 16:21:39 (6 years ago)

Author:

chris

Message:

• src/phone-kit/moko-dialer-mcc-dc.h: Replace "+1-" with "+1"

• src/phone-kit/moko-dialer.c: (on_network_registered), (start_handling_sms), (net_msghandler), (pb_msghandler), (sms_store_opened_cb), (dialer_init_gsmd), (moko_dialer_check_gsmd), (moko_dialer_send_sms): Try to resolve local numbers (numbers beginning in '0'), make gsmd requests in more reliable places, be a bit better with failures (all to do with SMS code)

• src/phone-kit/moko-dialer.h: Remove error code PK_DIALER_ERROR_NO_TOOLONG, add error code PK_DIALER_ERROR_INVALID_NUMBER

Location:

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

Files:

• ChangeLog (modified) (1 diff)
• src/phone-kit/moko-dialer-mcc-dc.h (modified) (13 diffs)
• src/phone-kit/moko-dialer.c (modified) (14 diffs)
• src/phone-kit/moko-dialer.h (modified) (1 diff)

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

@@ +1 @@
+2007-11-26  Chris Lord  <chris@openedhand.com>
+
+        * src/phone-kit/moko-dialer-mcc-dc.h:
+        Replace "+1-" with "+1"
+
+        * src/phone-kit/moko-dialer.c: (on_network_registered),
+        (start_handling_sms), (net_msghandler), (pb_msghandler),
+        (sms_store_opened_cb), (dialer_init_gsmd),
+        (moko_dialer_check_gsmd), (moko_dialer_send_sms):
+        Try to resolve local numbers (numbers beginning in '0'), make gsmd
+        requests in more reliable places, be a bit better with failures (all to
+        do with SMS code)
+
+        * src/phone-kit/moko-dialer.h:
+        Remove error code PK_DIALER_ERROR_NO_TOOLONG, add error code
+        PK_DIALER_ERROR_INVALID_NUMBER
+
 2007-11-23  Chris Lord  <chris@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer-mcc-dc.h

@@ -14 +14 @@
 { "276", "+355", "Albania" },
 { "603", "+213", "Algeria" },
-{ "544", "+1-684", "American Samoa (US)" },
+{ "544", "+1684", "American Samoa (US)" },
 { "213", "+376", "Andorra" },
 { "631", "+244", "Angola" },
-{ "365", "+1-264", "Anguilla" },
-{ "344", "+1-268", "Antigua and Barbuda" },
+{ "365", "+1264", "Anguilla" },
+{ "344", "+1268", "Antigua and Barbuda" },
 { "722", "+54", "Argentine Republic" },
 { "283", "+374", "Armenia" },
@@ -25 +25 @@
 { "232", "+43", "Austria" },
 { "400", "+994", "Azerbaijani Republic" },
-{ "364", "+1-242", "Bahamas" },
+{ "364", "+1242", "Bahamas" },
 { "426", "+973", "Bahrain" },
 { "470", "+880", "Bangladesh" },
-{ "342", "+1-246", "Barbados" },
+{ "342", "+1246", "Barbados" },
 { "257", "+375", "Belarus" },
 { "206", "+32", "Belgium" },
 { "702", "+501", "Belize" },
 { "616", "+229", "Benin" },
-{ "350", "+1-441", "Bermuda (UK)" },
+{ "350", "+1441", "Bermuda (UK)" },
 { "402", "+975", "Bhutan" },
 { "736", "+591", "Bolivia" },
@@ -39 +39 @@
 { "652", "+267", "Botswana" },
 { "724", "+55", "Brazil" },
-{ "348", "+1-284", "British Virgin Islands (UK)" },
+{ "348", "+1284", "British Virgin Islands (UK)" },
 { "528", "+673", "Brunei Darussalam" },
 { "284", "+359", "Bulgaria" },
@@ -48 +48 @@
 { "302", "+1", "Canada" },
 { "625", "+238", "Cape Verde" },
-{ "346", "+1-345", "Cayman Islands (UK)" },
+{ "346", "+1345", "Cayman Islands (UK)" },
 { "623", "+236", "Central African Republic" },
 { "622", "+235", "Chad" },
@@ -66 +66 @@
 { "238", "+45", "Denmark" },
 { "638", "+253", "Djibouti" },
-{ "366", "+1-767", "Dominica" },
-{ "370", "+1-809", "Dominican Republic" },
+{ "366", "+1767", "Dominica" },
+{ "370", "+1809", "Dominican Republic" },
 { "514", "+670", "East Timor" },
 { "740", "+593", "Ecuador" },
@@ -90 +90 @@
 { "202", "+30", "Greece" },
 { "290", "+299", "Greenland (Denmark)" },
-{ "352", "+1-473", "Grenada" },
+{ "352", "+1473", "Grenada" },
 { "340", "+590", "Guadeloupe (France)" },
-{ "535", "+1-671", "Guam (US)" },
+{ "535", "+1671", "Guam (US)" },
 { "704", "+502", "Guatemala" },
 { "611", "+224", "Guinea" },
@@ -110 +110 @@
 { "425", "+972", "Israel" },
 { "222", "+39", "Italy" },
-{ "338", "+1-876", "Jamaica" },
+{ "338", "+1876", "Jamaica" },
 { "441", "+81", "Japan" },
 { "440", "+81", "Japan" },
@@ -147 +147 @@
 { "212", "+377", "Monaco" },
 { "428", "+976", "Mongolia" },
-{ "354", "+1-664", "Montserrat (UK)" },
+{ "354", "+1664", "Montserrat (UK)" },
 { "604", "+212", "Morocco" },
 { "643", "+258", "Mozambique" },
@@ -161 +161 @@
 { "614", "+227", "Niger" },
 { "621", "+234", "Nigeria" },
-{ "534", "+1-670", "Northern Mariana Islands (US)" },
+{ "534", "+1670", "Northern Mariana Islands (US)" },
 { "242", "+47", "Norway" },
 { "422", "+968", "Oman" },
@@ -173 +173 @@
 { "260", "+48", "Poland" },
 { "351", "+351", "Portugal" },
-{ "330", "+1-787", "Puerto Rico (US)" },
+{ "330", "+1787", "Puerto Rico (US)" },
 { "427", "+974", "Qatar" },
 { "647", "+262", "Réunion (France)" },
@@ -179 +179 @@
 { "250", "+7", "Russian Federation" },
 { "635", "+250", "Rwandese Republic" },
-{ "356", "+1-869", "Saint Kitts and Nevis" },
-{ "358", "+1-758", "Saint Lucia" },
+{ "356", "+1869", "Saint Kitts and Nevis" },
+{ "358", "+1758", "Saint Lucia" },
 { "308", "+508", "Saint Pierre and Miquelon (France)" },
-{ "360", "+1-784", "Saint Vincent and the Grenadines" },
+{ "360", "+1784", "Saint Vincent and the Grenadines" },
 { "549", "+685", "Samoa" },
 { "292", "+378", "San Marino" },
@@ -211 +211 @@
 { "615", "+228", "Togolese Republic" },
 { "539", "+676", "Tonga" },
-{ "374", "+1-868", "Trinidad and Tobago" },
+{ "374", "+1868", "Trinidad and Tobago" },
 { "605", "+216", "Tunisia" },
 { "286", "+90", "Turkey" },
 { "438", "+993", "Turkmenistan" },
-{ "376", "+1-649", "Turks and Caicos Islands (UK)" },
+{ "376", "+1649", "Turks and Caicos Islands (UK)" },
 { "641", "+256", "Uganda" },
 { "255", "+380", "Ukraine" },
@@ -230 +230 @@
 { "315", "+1", "United States of America" },
 { "316", "+1", "United States of America" },
-{ "332", "+1-340", "United States Virgin Islands (US)" },
+{ "332", "+1340", "United States Virgin Islands (US)" },
 { "748", "+598", "Uruguay" },
 { "434", "+998", "Uzbekistan" },

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

@@ -76 +76 @@
   struct lgsm_handle *handle;
   MokoDialerSource   *source;
+  gboolean           handling_sms;
   
   /* Storage objects */
   JanaStore          *sms_store;
   gboolean           sms_store_open;
-        JanaNote           *last_msg;
+  JanaNote           *last_msg;
   MokoJournal        *journal;
   MokoContacts       *contacts;
@@ -110 +111 @@
 
 static void dialer_init_gsmd (MokoDialer *dialer);
+
+static const gchar *moko_dialer_cc_from_mcc (gchar *mcc);
 
 /* DBus functions */
@@ -427 +430 @@
     case GSMD_NETREG_REG_ROAMING:
       g_debug ("Network registered: LocationAreaCode: %x. CellID: %x.", lac, cell);
-      priv->gsm_location.lac = lac;
-      priv->gsm_location.cid = cell;
       
-      if ((priv->registered != GSMD_NETREG_REG_HOME) &&
-          (priv->registered != GSMD_NETREG_REG_ROAMING)) {
+      /* Retrieve details when we switch location/type */
+      if ((priv->registered != type) || (priv->gsm_location.lac != lac)) {
         /* Retrieve operator name */
         lgsm_oper_get (priv->handle);
@@ -441 +442 @@
         lgsm_get_imsi (priv->handle);
       }
+      
+      priv->gsm_location.lac = lac;
+      priv->gsm_location.cid = cell;
       
       break;
@@ -956 +960 @@
 }
 
+static void
+start_handling_sms (MokoDialer *dialer)
+{
+  MokoDialerPrivate *priv = dialer->priv;
+  
+  /* Register SMS handling callback */
+  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);
+  
+  priv->handling_sms = TRUE;
+}
+
 static int
 net_msghandler (struct lgsm_handle *lh, struct gsmd_msg_hdr *gmh)
@@ -971 +989 @@
     case GSMD_NETWORK_GET_NUMBER :
       g_free (priv->own_number);
-      priv->own_number = g_strdup (num->addr.number);
+      
+      if ((num->addr.number) && (num->addr.number[0] == '0') && (priv->imsi))
+        priv->own_number = g_strconcat (moko_dialer_cc_from_mcc (priv->imsi),
+                                        num->addr.number + 1, NULL);
+      else
+        priv->own_number = g_strdup (num->addr.number);
+      
+      if ((priv->sms_store_open) && (!priv->handling_sms)) {
+        start_handling_sms (dialer);
+      }
+      
       break;
     case GSMD_NETWORK_OPER_GET :
@@ -1004 +1032 @@
     case GSMD_PHONEBOOK_GET_IMSI :
       priv->imsi = g_strdup ((char *)gmh + sizeof (*gmh));
+      
+      /* Get phone number */
+      lgsm_get_subscriber_num (priv->handle);
       break;
     default :
@@ -1055 +1086 @@
   g_debug ("SMS store opened");
   
-  if (!priv->handle) return;
-  
-  /* Register SMS handling callback */
-  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);
+  if (priv->handle && priv->own_number) {
+    start_handling_sms (self);
+  }
 }
 
@@ -1104 +1131 @@
   priv->registered = GSMD_NETREG_UNREG;
   lgsm_netreg_register (priv->handle, "");
-
+  
   /* Get phone number */
   lgsm_get_subscriber_num (priv->handle);
-  
+
   /* Start polling for events */
   priv->source = (MokoDialerSource *)
@@ -1195 +1222 @@
   MokoDialerPrivate *priv = self->priv;
   
+  if (!priv->handle) dialer_init_gsmd (self);
+  
   if (!priv->handle) {
     *error = g_error_new (PHONE_KIT_DIALER_ERROR, PK_DIALER_ERROR_GSMD,
@@ -1241 +1270 @@
   gboolean ascii;
   JanaNote *note;
+  const gchar *dialcode;
   
   g_assert (self && number && message);
@@ -1259 +1289 @@
   /* Set destination number */
   if (strlen (number) > GSMD_ADDR_MAXLEN + 1) {
-    *error = g_error_new (PHONE_KIT_DIALER_ERROR, PK_DIALER_ERROR_NO_TOOLONG,
-                          "Number too long");
+    *error = g_error_new (PHONE_KIT_DIALER_ERROR,
+                          PK_DIALER_ERROR_INVALID_NUMBER,
+                          "Invalid number");
     return FALSE;
   } else {
@@ -1287 +1318 @@
   } else {
     sms.alpha = ALPHABET_8BIT;
-    sms.length = strlen (message);
     strcpy ((gchar *)sms.data, message);
   }
+  sms.length = msg_length;
   
   /* Send message */
@@ -1296 +1327 @@
   /* Store sent message in journal */
   note = jana_ecal_note_new ();
-  jana_note_set_recipient (note, number);
+  if ((number[0] == '0') && (priv->network_number) &&
+      (dialcode = moko_dialer_cc_from_mcc (priv->network_number))) {
+    gchar *full_number = g_strconcat (dialcode, number + 1, NULL);
+    jana_note_set_recipient (note, full_number);
+    g_free (full_number);
+  } else
+    jana_note_set_recipient (note, number);
   jana_note_set_author (note, priv->own_number);
   

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

@@ -52 +52 @@
   PK_DIALER_ERROR_SMS_STORE,
   PK_DIALER_ERROR_SMS_TOOLONG,
-  PK_DIALER_ERROR_NO_TOOLONG,
   PK_DIALER_ERROR_NO_PROVIDER,
   PK_DIALER_ERROR_NO_PROVIDER_NUM,
   PK_DIALER_ERROR_NO_IMSI,
   PK_DIALER_ERROR_NO_NUMBER,
+  PK_DIALER_ERROR_INVALID_NUMBER,
 } PhoneKitDialerError;