Bug 870562 - B2G MMS: Fail to expose correct MMS message threadID. r=vicamo a=leo+
authorGene Lian <clian@mozilla.com>
Fri, 10 May 2013 16:16:24 +0800
changeset 142625 b40c41c73962a3f3e1fd07a541d90a117dbe8216
parent 142624 7ec0e93663cddd3816524c53b7e46a04aec0b159
child 142626 2b4281dba4bff54f335a3a2878e69c434e682a35
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvicamo, leo
bugs870562
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 870562 - B2G MMS: Fail to expose correct MMS message threadID. r=vicamo a=leo+
dom/mms/src/ril/MmsService.js
dom/system/gonk/RadioInterfaceLayer.js
--- a/dom/mms/src/ril/MmsService.js
+++ b/dom/mms/src/ril/MmsService.js
@@ -1081,25 +1081,27 @@ MmsService.prototype = {
     if (DEBUG) debug("Broadcasting the MMS system message: " + aName);
 
     // Sadly we cannot directly broadcast the aDomMessage object
     // because the system message mechamism will rewrap the object
     // based on the content window, which needs to know the properties.
     gSystemMessenger.broadcastMessage(aName, {
       type:           aDomMessage.type,
       id:             aDomMessage.id,
+      threadId:       aDomMessage.threadId,
       delivery:       aDomMessage.delivery,
       deliveryStatus: aDomMessage.deliveryStatus,
       sender:         aDomMessage.sender,
       receivers:      aDomMessage.receivers,
-      timestamp:      aDomMessage.timestamp.getTime(),
+      timestamp:      aDomMessage.timestamp,
       read:           aDomMessage.read,
       subject:        aDomMessage.subject,
       smil:           aDomMessage.smil,
-      attachments:    aDomMessage.attachments
+      attachments:    aDomMessage.attachments,
+      expiryDate:     aDomMessage.expiryDate
     });
   },
 
   /**
    * A helper function to broadcast system message and notify observers that
    * an MMS is sent.
    *
    * @params aDomMessage
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -1501,17 +1501,17 @@ RadioInterfaceLayer.prototype = {
       id:             aDomMessage.id,
       threadId:       aDomMessage.threadId,
       delivery:       aDomMessage.delivery,
       deliveryStatus: aDomMessage.deliveryStatus,
       sender:         aDomMessage.sender,
       receiver:       aDomMessage.receiver,
       body:           aDomMessage.body,
       messageClass:   aDomMessage.messageClass,
-      timestamp:      aDomMessage.timestamp.getTime(),
+      timestamp:      aDomMessage.timestamp,
       read:           aDomMessage.read
     });
   },
 
   portAddressedSmsApps: null,
   handleSmsReceived: function handleSmsReceived(message) {
     debug("handleSmsReceived: " + JSON.stringify(message));