wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 969218 - Part 5: Use promise for dial and dialEmergency - provider. r=hsinyi

Browse Source
This commit is contained in:
Szu-Yu Chen [:aknow] 2014-02-27 14:12:30 +08:00
parent f29a5c9fba
commit edf60cc491
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dom/telephony/gonk/TelephonyProvider.js
View File

@ -400,34 +400,44 @@ TelephonyProvider.prototype = {
});
},
dial: function(aClientId, aNumber, aIsEmergency) {
isDialing: false,
dial: function(aClientId, aNumber, aIsEmergency, aTelephonyCallback) {
if (DEBUG) debug("Dialing " + (aIsEmergency ? "emergency " : "") + aNumber);
if (this.isDialing) {
if (DEBUG) debug("Already has a dialing call. Drop.");
aTelephonyCallback.notifyDialError("InvalidStateError");
return;
}
// we don't try to be too clever here, as the phone is probably in the
// locked state. Let's just check if it's a number without normalizing
if (!aIsEmergency) {
aNumber = gPhoneNumberUtils.normalize(aNumber);
}
// Validate the number.
if (!gPhoneNumberUtils.isPlainPhoneNumber(aNumber)) {
// Note: isPlainPhoneNumber also accepts USSD and SS numbers
if (DEBUG) debug("Number '" + aNumber + "' is not viable. Drop.");
let errorMsg = RIL.RIL_CALL_FAILCAUSE_TO_GECKO_CALL_ERROR[RIL.CALL_FAIL_UNOBTAINABLE_NUMBER];
Services.tm.currentThread.dispatch(
this.notifyCallError.bind(this, aClientId, -1, errorMsg),
Ci.nsIThread.DISPATCH_NORMAL);
aTelephonyCallback.notifyDialError(errorMsg);
return;
}
this.isDialing = true;
this._getClient(aClientId).sendWorkerMessage("dial", {
number: aNumber,
isDialEmergency: aIsEmergency
}, (function(clientId, response) {
if (!response.success) {
this.notifyCallError(clientId, -1, response.errorMsg);
}, (function(response) {
this.isDialing = false;
if (response.success) {
aTelephonyCallback.notifyDialSuccess();
} else {
aTelephonyCallback.notifyDialError(response.errorMsg);
}
return false;
}).bind(this, aClientId));
}).bind(this));
},
hangUp: function(aClientId, aCallIndex) {