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

Bug 720643 - B2G SMS: Notify SMS send success. r=qDot

This commit is contained in:
Philipp von Weitershausen 2012-02-20 00:44:29 +01:00
Родитель 1a9c718b5f
Коммит 1134043c1d
4 изменённых файлов: 79 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
dom/sms/src/ril/SmsService.cpp
Просмотреть файл

@ -89,7 +89,7 @@ SmsService::Send(const nsAString& aNumber,
return NS_OK;
}
mRIL->SendSMS(aNumber, aMessage);
mRIL->SendSMS(aNumber, aMessage, aRequestId, aProcessId);
return NS_OK;
}

26
dom/system/b2g/RadioInterfaceLayer.js
Просмотреть файл

@ -59,11 +59,16 @@ const nsIRadioInterfaceLayer = Ci.nsIRadioInterfaceLayer;
const kSmsReceivedObserverTopic = "sms-received";
const DOM_SMS_DELIVERY_RECEIVED = "received";
const DOM_SMS_DELIVERY_SENT = "sent";
XPCOMUtils.defineLazyServiceGetter(this, "gSmsService",
"@mozilla.org/sms/smsservice;1",
"nsISmsService");
XPCOMUtils.defineLazyServiceGetter(this, "gSmsRequestManager",
"@mozilla.org/sms/smsrequestmanager;1",
"nsISmsRequestManager");
function convertRILCallState(state) {
switch (state) {
case RIL.CALL_STATE_ACTIVE:
@ -201,6 +206,9 @@ RadioInterfaceLayer.prototype = {
case "sms-received":
this.handleSmsReceived(message);
return;
case "sms-sent":
this.handleSmsSent(message);
return;
case "datacallstatechange":
this.handleDataCallState(message.datacall);
break;
@ -310,6 +318,18 @@ RadioInterfaceLayer.prototype = {
Services.obs.notifyObservers(sms, kSmsReceivedObserverTopic, null);
},
handleSmsSent: function handleSmsSent(message) {
let message = gSmsService.createSmsMessage(-1,
DOM_SMS_DELIVERY_SENT,
message.SMSC,
message.number,
message.body,
Date.now());
//TODO At this point we should save the sms into the DB (bug 712809)
//TODO handle errors (bug XXX)
gSmsRequestManager.notifySmsSent(message.requestId, message);
},
/**
* Handle data call state changes.
*/
@ -402,10 +422,12 @@ RadioInterfaceLayer.prototype = {
return Math.ceil(text.length / 160);
},
sendSMS: function sendSMS(number, message) {
sendSMS: function sendSMS(number, message, requestId, processId) {
this.worker.postMessage({type: "sendSMS",
number: number,
body: message});
body: message,
requestId: requestId,
processId: processId});
},
_callbacks: null,

9
dom/system/b2g/nsIRadioInterfaceLayer.idl
Просмотреть файл

@ -116,7 +116,7 @@ interface nsIRILDataCallback : nsISupports
in unsigned long length);
};
[scriptable, uuid(9b7e3a01-9c45-4af3-81bb-1bf08a842226)]
[scriptable, uuid(aeb7ffe7-7d3a-4b7d-9b59-b6d3ae1c72ed)]
interface nsIRadioInterfaceLayer : nsISupports
{
const unsigned short CALL_STATE_UNKNOWN = 0;
@ -177,7 +177,7 @@ interface nsIRadioInterfaceLayer : nsISupports
void deactivateDataCall(in DOMString cid,
in DOMString reason);
void getDataCallList();
void registerDataCallCallback(in nsIRILDataCallback callback);
void unregisterDataCallCallback(in nsIRILDataCallback callback);
@ -185,5 +185,8 @@ interface nsIRadioInterfaceLayer : nsISupports
* SMS-related functionality.
*/
unsigned short getNumberOfMessagesForText(in DOMString text);
void sendSMS(in DOMString number, in DOMString message);
void sendSMS(in DOMString number,
in DOMString message,
in long requestId,
in unsigned long long processId);
};

71
dom/system/b2g/ril_worker.js
Просмотреть файл

@ -438,12 +438,14 @@ let Buf = {
let response_type = this.readUint32();
let length = this.readIncoming - UINT32_SIZE;
let request_type;
let request_type, options;
if (response_type == RESPONSE_TYPE_SOLICITED) {
let token = this.readUint32();
let error = this.readUint32();
length -= 2 * UINT32_SIZE;
request_type = this.tokenRequestMap[token];
options = this.tokenRequestMap[token];
request_type = options.rilRequestType;
if (error) {
//TODO
if (DEBUG) {
@ -467,7 +469,7 @@ let Buf = {
return;
}
RIL.handleParcel(request_type, length);
RIL.handleParcel(request_type, length, options);
},
/**
@ -475,15 +477,23 @@ let Buf = {
*
* @param type
* Integer specifying the request type.
* @param options [optional]
* Object containing information about the request, e.g. the
* original main thread message object that led to the RIL request.
*/
newParcel: function newParcel(type) {
newParcel: function newParcel(type, options) {
if (DEBUG) debug("New outgoing parcel of type " + type);
// We're going to leave room for the parcel size at the beginning.
this.outgoingIndex = PARCEL_SIZE_SIZE;
this.writeUint32(type);
let token = this.token;
this.writeUint32(token);
this.tokenRequestMap[token] = type;
if (!options) {
options = {};
}
options.rilRequestType = type;
this.tokenRequestMap[token] = options;
this.token++;
return token;
},
@ -753,9 +763,11 @@ let RIL = {
/**
* Send an SMS.
*
* @param smscPDU
* The `options` parameter object should contain the following attributes:
*
* @param SMSC
* String containing the SMSC PDU in hex format.
* @param address
* @param number
* String containing the recipients address.
* @param body
* String containing the message body.
@ -765,15 +777,18 @@ let RIL = {
* @param bodyLengthInOctets
* Byte length of the message body when encoded with the given DCS.
*/
sendSMS: function sendSMS(smscPDU, address, body, dcs, bodyLengthInOctets) {
let token = Buf.newParcel(REQUEST_SEND_SMS);
sendSMS: function sendSMS(options) {
let token = Buf.newParcel(REQUEST_SEND_SMS, options);
//TODO we want to map token to the input values so that on the
// response from the RIL device we know which SMS request was successful
// or not. Maybe we should build that functionality into newParcel() and
// handle it within tokenRequestMap[].
Buf.writeUint32(2);
Buf.writeString(smscPDU);
GsmPDUHelper.writeMessage(address, body, dcs, bodyLengthInOctets);
Buf.writeString(options.SMSC);
GsmPDUHelper.writeMessage(options.number,
options.body,
options.dcs,
options.bodyLengthInOctets);
Buf.sendParcel();
},
@ -907,11 +922,11 @@ let RIL = {
* _is_ the method name, so that's easy.
*/
handleParcel: function handleParcel(request_type, length) {
handleParcel: function handleParcel(request_type, length, options) {
let method = this[request_type];
if (typeof method == "function") {
if (DEBUG) debug("Handling parcel as " + method.name);
method.call(this, length);
method.call(this, length, options);
}
}
};
@ -1064,11 +1079,11 @@ RIL[REQUEST_RADIO_POWER] = null;
RIL[REQUEST_DTMF] = function REQUEST_DTMF() {
Phone.onSendTone();
};
RIL[REQUEST_SEND_SMS] = function REQUEST_SEND_SMS() {
let messageRef = Buf.readUint32();
let ackPDU = Buf.readString();
let errorCode = Buf.readUint32();
Phone.onSendSMS(messageRef, ackPDU, errorCode);
RIL[REQUEST_SEND_SMS] = function REQUEST_SEND_SMS(length, options) {
options.messageRef = Buf.readUint32();
options.ackPDU = Buf.readString();
options.errorCode = Buf.readUint32();
Phone.onSendSMS(options);
};
RIL[REQUEST_SEND_SMS_EXPECT_MORE] = null;
RIL[REQUEST_SETUP_DATA_CALL] = function REQUEST_SETUP_DATA_CALL() {
@ -1753,8 +1768,9 @@ let Phone = {
onSetSMSCAddress: function onSetSMSCAddress() {
},
onSendSMS: function onSendSMS(messageRef, ackPDU, errorCode) {
//TODO
onSendSMS: function onSendSMS(options) {
options.type = "sms-sent";
this.sendDOMMessage(options);
},
onNewSMS: function onNewSMS(payloadLength) {
@ -2013,6 +2029,10 @@ let Phone = {
* String containing the recipient number.
* @param body
* String containing the message text.
* @param requestId
* String identifying the sms request used by the SmsRequestManager.
* @param processId
* String containing the processId for the SmsRequestManager.
*/
sendSMS: function sendSMS(options) {
// Get the SMS Center address
@ -2025,12 +2045,17 @@ let Phone = {
}
return;
}
// We explicitly save this information on the options object so that we
// can refer to it later, in particular on the main thread (where this
// object may get sent eventually.)
options.SMSC = this.SMSC;
//TODO: verify values on 'options'
//TODO: the data encoding and length in octets should eventually be
// computed on the mainthread and passed down to us.
RIL.sendSMS(this.SMSC, options.number, options.body,
PDU_DCS_MSG_CODING_7BITS_ALPHABET, //TODO: hard-coded for now,
Math.ceil(options.body.length * 7 / 8)); //TODO: ditto
options.dcs = PDU_DCS_MSG_CODING_7BITS_ALPHABET;
options.bodyLengthInOctets = Math.ceil(options.body.length * 7 / 8);
RIL.sendSMS(options);
},
/**