Backed out changeset 307e7260ada2 (bug 921918) Windows XP Debug Bustage on a CLOSED TREE

dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl

@@ -31,6 +31,7 @@ interface nsIRilMobileMessageDatabaseService : nsIMobileMessageDatabaseService
   /**
    * |aMessage| Object: should contain the following properties for internal use:
    *   - |type| DOMString: "sms" or "mms"
+   *   - |sender| DOMString: the phone number of sender
    *   - |timestamp| Number: the timestamp of received message
    *   - |iccId| DOMString: [optional] the ICC ID of the SIM for receiving
    *                        message if available.
@@ -39,7 +40,6 @@ interface nsIRilMobileMessageDatabaseService : nsIMobileMessageDatabaseService
    *     - |messageClass| DOMString: the message class of received message
    *     - |receiver| DOMString: the phone number of receiver
    *     - |pid| Number: the TP-PID field of the SMS TPDU, default 0.
-   *     - |sender| DOMString: the phone number of sender
    *
    *   - If |type| == "mms", we also need:
    *     - |delivery| DOMString: the delivery state of received message

dom/mobilemessage/src/gonk/MmsService.js

@@ -1456,7 +1456,13 @@ MmsService.prototype = {
     }
 
     intermediate.timestamp = Date.now();
+    intermediate.sender = null;
     intermediate.transactionId = intermediate.headers["x-mms-transaction-id"];
+    if (intermediate.headers.from) {
+      intermediate.sender = intermediate.headers.from.address;
+    } else {
+      intermediate.sender = "anonymous";
+    }
     intermediate.receivers = [];
     intermediate.phoneNumber = mmsConnection.getPhoneNumber();
     intermediate.iccId = mmsConnection.getIccId();
@@ -1479,6 +1485,11 @@ MmsService.prototype = {
                                                                   intermediate,
                                                                   savable) {
     savable.timestamp = Date.now();
+    if (intermediate.headers.from) {
+      savable.sender = intermediate.headers.from.address;
+    } else {
+      savable.sender = "anonymous";
+    }
     savable.receivers = [];
     // We don't have Bcc in recevied MMS message.
     for each (let type in ["cc", "to"]) {

dom/mobilemessage/src/gonk/MobileMessageDatabaseService.js

@@ -1940,31 +1940,21 @@ MobileMessageDatabaseService.prototype = {
 
   saveReceivedMessage: function saveReceivedMessage(aMessage, aCallback) {
     if ((aMessage.type != "sms" && aMessage.type != "mms") ||
-        (aMessage.type == "sms" && (aMessage.messageClass == undefined ||
-                                    aMessage.sender == undefined)) ||
+        (aMessage.type == "sms" && aMessage.messageClass == undefined) ||
         (aMessage.type == "mms" && (aMessage.delivery == undefined ||
                                     aMessage.transactionId == undefined ||
                                     !Array.isArray(aMessage.deliveryInfo) ||
                                     !Array.isArray(aMessage.receivers))) ||
+        aMessage.sender == undefined ||
         aMessage.timestamp == undefined) {
       if (aCallback) {
         aCallback.notify(Cr.NS_ERROR_FAILURE, null);
       }
       return;
     }
-
-    let threadParticipants;
+    let threadParticipants = [aMessage.sender];
     if (aMessage.type == "mms") {
-      if (aMessage.headers.from) {
-        aMessage.sender = aMessage.headers.from.address;
-      } else {
-        aMessage.sender = "anonymous";
-      }
-
-      threadParticipants = [aMessage.sender];
       this.fillReceivedMmsThreadParticipants(aMessage, threadParticipants);
-    } else { // SMS
-      threadParticipants = [aMessage.sender];
     }
 
     let timestamp = aMessage.timestamp;