Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 06:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 853752 - B2G MMS: after retrieving MMS, delete the thread containing the previous notification indication (follow-up fix). r=vicamo a=leo+

Browse Source
This commit is contained in:
Gene Lian 2013-04-25 19:47:44 +08:00
parent 89f06e32e7
commit 62495c91f3
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dom/mobilemessage/src/ril/MobileMessageDatabaseService.js
View File

@ -855,10 +855,13 @@ MobileMessageDatabaseService.prototype = {
saveRecord: function saveRecord(aMessageRecord, aAddresses, aCallback) {
let isOverriding = (aMessageRecord.id !== undefined);
let oldThreadId = 0;
if (!isOverriding) {
// Assign a new id.
this.lastMessageId += 1;
aMessageRecord.id = this.lastMessageId;
} else {
oldThreadId = aMessageRecord.threadId;
}
if (DEBUG) debug("Going to store " + JSON.stringify(aMessageRecord));
@ -898,18 +901,6 @@ MobileMessageDatabaseService.prototype = {
return;
}
// If the overriding message is going to be saved into another
// thread which is different from the original one containing the
// overrided message, we need to update the original thread info.
if (isOverriding &&
(!threadRecord || threadRecord.id != aMessageRecord.threadId)) {
self.updateThreadByMessageChange(messageStore,
threadStore,
aMessageRecord.threadId,
aMessageRecord.id,
aMessageRecord.read);
}
let insertMessageRecord = function (threadId) {
// Setup threadId & threadIdIndex.
aMessageRecord.threadId = threadId;
@ -921,6 +912,17 @@ MobileMessageDatabaseService.prototype = {
}
// Really add to message store.
messageStore.put(aMessageRecord);
// If the overriding message is going to be saved into another
// thread which is different from the original one containing the
// overrided message, we need to update the original thread info.
if (isOverriding && threadId != oldThreadId) {
self.updateThreadByMessageChange(messageStore,
threadStore,
oldThreadId,
aMessageRecord.id,
aMessageRecord.read);
}
};
let timestamp = aMessageRecord.timestamp;