mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 867440 - B2G MMS: Add more delivery status in delivery "not-downloaded" and send the dom message with right delivery status. r=vyang

This commit is contained in:
Chia-hung Tai 2013-05-10 11:50:18 -07:00
Родитель 2d2c520fe3
Коммит e06358dd9e
5 изменённых файлов: 84 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

85
dom/mms/src/ril/MmsService.js
Просмотреть файл

@ -59,9 +59,11 @@ const DELIVERY_SENDING = "sending";
const DELIVERY_SENT = "sent";
const DELIVERY_ERROR = "error";
const DELIVERY_STATUS_SUCCESS = "success";
const DELIVERY_STATUS_PENDING = "pending";
const DELIVERY_STATUS_ERROR = "error";
const DELIVERY_STATUS_SUCCESS = "success";
const DELIVERY_STATUS_PENDING = "pending";
const DELIVERY_STATUS_ERROR = "error";
const DELIVERY_STATUS_REJECTED = "rejected";
const DELIVERY_STATUS_MANUAL = "manual";
const PREF_SEND_RETRY_COUNT =
Services.prefs.getIntPref("dom.mms.sendRetryCount");
@ -965,13 +967,35 @@ MmsService.prototype = {
/**
* Convert intermediate message to indexedDB savable object.
*
* @param retrievalMode
* Retrieval mode for MMS receiving setting.
* @param intermediate
* Intermediate MMS message parsed from PDU.
*/
convertIntermediateToSavable: function convertIntermediateToSavable(intermediate) {
convertIntermediateToSavable: function convertIntermediateToSavable(intermediate,
retrievalMode) {
intermediate.type = "mms";
intermediate.delivery = DELIVERY_NOT_DOWNLOADED;
intermediate.deliveryStatus = [DELIVERY_STATUS_PENDING];
switch(retrievalMode) {
case RETRIEVAL_MODE_MANUAL:
intermediate.deliveryStatus = [DELIVERY_STATUS_MANUAL];
break;
case RETRIEVAL_MODE_NEVER:
intermediate.deliveryStatus = [DELIVERY_STATUS_REJECTED];
break;
case RETRIEVAL_MODE_AUTOMATIC:
intermediate.deliveryStatus = [DELIVERY_STATUS_PENDING];
break;
case RETRIEVAL_MODE_AUTOMATIC_HOME:
if (gMmsConnection.isVoiceRoaming()) {
intermediate.deliveryStatus = [DELIVERY_STATUS_MANUAL];
} else {
intermediate.deliveryStatus = [DELIVERY_STATUS_PENDING];
}
break;
}
intermediate.timestamp = Date.now();
intermediate.sender = null;
intermediate.transactionId = intermediate.headers["x-mms-transaction-id"];
@ -1133,6 +1157,15 @@ MmsService.prototype = {
mmsStatus,
reportAllowed);
transaction.run();
// Retrieved fail after retry, so we update the delivery status in DB and
// notify this domMessage that error happen.
gMobileMessageDatabaseService.setMessageDelivery(id,
null,
null,
DELIVERY_STATUS_ERROR,
(function (rv, domMessage) {
this.broadcastReceivedMessageEvent(domMessage);
}).bind(this));
return;
}
@ -1160,7 +1193,7 @@ MmsService.prototype = {
// that storing an incoming MMS failed, most likely due to a full disk.
// The end user has to retrieve the MMS again.
if (DEBUG) debug("Could not store MMS " + domMessage.id +
", error code " + rv);
", error code " + rv);
return;
}
@ -1171,7 +1204,8 @@ MmsService.prototype = {
/**
* Callback for saveReceivedMessage.
*/
saveReceivedMessageCallback: function saveReceivedMessageCallback(savableMessage,
saveReceivedMessageCallback: function saveReceivedMessageCallback(retrievalMode,
savableMessage,
rv,
domMessage) {
let success = Components.isSuccessCode(rv);
@ -1193,11 +1227,6 @@ MmsService.prototype = {
this.broadcastReceivedMessageEvent(domMessage);
let retrievalMode = RETRIEVAL_MODE_MANUAL;
try {
retrievalMode = Services.prefs.getCharPref(PREF_RETRIEVAL_MODE);
} catch (e) {}
// In roaming environment, we send notify response only in
// automatic retrieval mode.
if ((retrievalMode !== RETRIEVAL_MODE_AUTOMATIC) &&
@ -1248,11 +1277,18 @@ MmsService.prototype = {
return;
}
let savableMessage = this.convertIntermediateToSavable(notification);
let retrievalMode = RETRIEVAL_MODE_MANUAL;
try {
retrievalMode = Services.prefs.getCharPref(PREF_RETRIEVAL_MODE);
} catch (e) {}
let savableMessage = this.convertIntermediateToSavable(notification, retrievalMode);
gMobileMessageDatabaseService
.saveReceivedMessage(savableMessage,
this.saveReceivedMessageCallback.bind(this, savableMessage));
this.saveReceivedMessageCallback.bind(this,
retrievalMode,
savableMessage));
}).bind(this));
},
@ -1454,6 +1490,16 @@ MmsService.prototype = {
aRequest.notifyGetMessageFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
return;
}
if (DELIVERY_NOT_DOWNLOADED != aMessageRecord.delivery) {
if (DEBUG) debug("Delivery of message record is not 'not-downloaded'.");
aRequest.notifyGetMessageFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
return;
}
if (DELIVERY_STATUS_PENDING == aMessageRecord.deliveryStatus) {
if (DEBUG) debug("Delivery status of message record is 'pending'.");
aRequest.notifyGetMessageFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
return;
}
// Cite 6.2 "Multimedia Message Notification" in OMA-TS-MMS_ENC-V1_3-20110913-A:
// The field has only one format, relative. The recipient client calculates
@ -1471,7 +1517,7 @@ MmsService.prototype = {
let url = aMessageRecord.headers["x-mms-content-location"].uri;
// For X-Mms-Report-Allowed
let wish = aMessageRecord.headers["x-mms-delivery-report"];
this.retrieveMessage(url, (function responseNotify(mmsStatus, retrievedMsg) {
let responseNotify = function responseNotify(mmsStatus, retrievedMsg) {
// If the mmsStatus is still MMS_PDU_STATUS_DEFERRED after retry,
// we should not store it into database.
if (MMS.MMS_PDU_STATUS_RETRIEVED !== mmsStatus) {
@ -1525,7 +1571,14 @@ MmsService.prototype = {
let transaction = new AcknowledgeTransaction(transactionId, reportAllowed);
transaction.run();
}).bind(this));
}).bind(this));
};
// Update the delivery status to pending in DB.
gMobileMessageDatabaseService
.setMessageDelivery(aMessageId,
null,
null,
DELIVERY_STATUS_PENDING,
this.retrieveMessage(url, responseNotify.bind(this)));
}).bind(this));
},

2
dom/mobilemessage/src/Constants.h
Просмотреть файл

@ -33,6 +33,8 @@ extern const char* kMmsReceivedObserverTopic;
#define DELIVERY_STATUS_SUCCESS NS_LITERAL_STRING("success")
#define DELIVERY_STATUS_PENDING NS_LITERAL_STRING("pending")
#define DELIVERY_STATUS_ERROR NS_LITERAL_STRING("error")
#define DELIVERY_STATUS_REJECTED NS_LITERAL_STRING("rejected")
#define DELIVERY_STATUS_MANUAL NS_LITERAL_STRING("manual")
#define MESSAGE_CLASS_NORMAL NS_LITERAL_STRING("normal")
#define MESSAGE_CLASS_CLASS_0 NS_LITERAL_STRING("class-0")

10
dom/mobilemessage/src/MmsMessage.cpp
Просмотреть файл

@ -188,6 +188,10 @@ MmsMessage::Create(int32_t aId,
status = eDeliveryStatus_Pending;
} else if (statusStr.Equals(DELIVERY_STATUS_ERROR)) {
status = eDeliveryStatus_Error;
} else if (statusStr.Equals(DELIVERY_STATUS_REJECTED)) {
status = eDeliveryStatus_Reject;
} else if (statusStr.Equals(DELIVERY_STATUS_MANUAL)) {
status = eDeliveryStatus_Manual;
} else {
return NS_ERROR_INVALID_ARG;
}
@ -381,6 +385,12 @@ MmsMessage::GetDeliveryStatus(JSContext* aCx, JS::Value* aDeliveryStatus)
case eDeliveryStatus_Error:
statusStr = DELIVERY_STATUS_ERROR;
break;
case eDeliveryStatus_Reject:
statusStr = DELIVERY_STATUS_REJECTED;
break;
case eDeliveryStatus_Manual:
statusStr = DELIVERY_STATUS_MANUAL;
break;
case eDeliveryStatus_EndGuard:
default:
MOZ_NOT_REACHED("We shouldn't get any other delivery status!");

2
dom/mobilemessage/src/MobileMessageThread.cpp
Просмотреть файл

@ -186,7 +186,7 @@ MobileMessageThread::GetLastMessageType(nsAString& aLastMessageType)
break;
case eMessageType_EndGuard:
default:
MOZ_NOT_REACHED("We shouldn't get any other delivery state!");
MOZ_NOT_REACHED("We shouldn't get any other message type!");
return NS_ERROR_UNEXPECTED;
}

2
dom/mobilemessage/src/Types.h
Просмотреть файл

@ -32,6 +32,8 @@ enum DeliveryStatus {
eDeliveryStatus_Success,
eDeliveryStatus_Pending,
eDeliveryStatus_Error,
eDeliveryStatus_Reject,
eDeliveryStatus_Manual,
// This state should stay at the end.
eDeliveryStatus_EndGuard
};