Bug 749086 - 1/3: Use DOMRequest instead of SmsRequest. Interface changes. sr=sicking, r=bent, a=leo+
authorVicamo Yang <vyang@mozilla.com>
Thu, 18 Apr 2013 09:09:44 +0800
changeset 119101 3a29c841f3b296cfdeae9ed0bdec044b69066916
parent 119100 c130c359ea7177adde4a26127f8793b9bb3ec9e2
child 119102 417880a025d11069d9aa7acd9af101feaef27ad3
push id680
push uservyang@mozilla.com
push dateThu, 18 Apr 2013 01:11:41 +0000
reviewerssicking, bent, leo
bugs749086
milestone18.0
Bug 749086 - 1/3: Use DOMRequest instead of SmsRequest. Interface changes. sr=sicking, r=bent, a=leo+
dom/mobilemessage/interfaces/nsIDOMMobileMessageManager.idl
dom/mobilemessage/interfaces/nsIDOMSmsManager.idl
dom/mobilemessage/interfaces/nsIDOMSmsRequest.idl
dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl
--- a/dom/mobilemessage/interfaces/nsIDOMMobileMessageManager.idl
+++ b/dom/mobilemessage/interfaces/nsIDOMMobileMessageManager.idl
@@ -1,39 +1,38 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIDOMEventTarget.idl"
 
 interface nsIDOMEventListener;
-interface nsIDOMMozSmsRequest;
 interface nsIDOMMozSmsFilter;
 interface nsIDOMMozSmsSegmentInfo;
 interface nsIDOMDOMCursor;
 interface nsIDOMDOMRequest;
 interface nsIDOMBlob;
 
 dictionary MmsParameters
 {
   jsval      receivers; // DOMString[]
   DOMString? subject;
   DOMString? smil;
   jsval      attachments; // MmsAttachment[]
 };
 
-[scriptable, builtinclass, uuid(370da692-b79a-45d3-a07a-f9284e8c392b)]
+[scriptable, builtinclass, uuid(a7984cb3-27c8-4e3d-82a4-01553e93c078)]
 interface nsIDOMMozMobileMessageManager : nsIDOMEventTarget
 {
   nsIDOMMozSmsSegmentInfo getSegmentInfoForText(in DOMString text);
 
   // The first parameter can be either a DOMString (only one number) or an array
   // of DOMStrings.
-  // The method returns a SmsRequest object if one number has been passed.
-  // An array of SmsRequest objects otherwise.
+  // The method returns a DOMRequest object if one number has been passed.
+  // An array of DOMRequest objects otherwise.
   jsval send(in jsval number, in DOMString message);
 
   nsIDOMDOMRequest sendMMS(in jsval parameters /* MmsParameters */);
 
   [binaryname(GetMessageMoz)]
   nsIDOMDOMRequest getMessage(in long id);
 
   // The parameter can be either a message id or a nsIDOMMoz{Mms,Sms}Message.
--- a/dom/mobilemessage/interfaces/nsIDOMSmsManager.idl
+++ b/dom/mobilemessage/interfaces/nsIDOMSmsManager.idl
@@ -1,41 +1,41 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIDOMEventTarget.idl"
 
 interface nsIDOMDOMCursor;
+interface nsIDOMDOMRequest;
 interface nsIDOMEventListener;
-interface nsIDOMMozSmsRequest;
 interface nsIDOMMozSmsFilter;
 interface nsIDOMMozSmsSegmentInfo;
 
-[scriptable, builtinclass, uuid(7371acd3-136b-4081-b368-8f5c69a22103)]
+[scriptable, builtinclass, uuid(8ce00d77-71b4-43f6-92a1-2eae7c9581b9)]
 interface nsIDOMMozSmsManager : nsIDOMEventTarget
 {
   nsIDOMMozSmsSegmentInfo getSegmentInfoForText(in DOMString text);
 
   // The first parameter can be either a DOMString (only one number) or an array
   // of DOMStrings.
-  // The method returns a SmsRequest object if one number has been passed.
-  // An array of SmsRequest objects otherwise.
+  // The method returns a DOMRequest object if one number has been passed.
+  // An array of DOMRequest objects otherwise.
   jsval send(in jsval number, in DOMString message);
 
   [binaryname(GetMessageMoz)]
-  nsIDOMMozSmsRequest getMessage(in long id);
+  nsIDOMDOMRequest getMessage(in long id);
 
   // The parameter can be either a message id or a SmsMessage.
-  nsIDOMMozSmsRequest delete(in jsval param);
+  nsIDOMDOMRequest delete(in jsval param);
 
   // Iterates through nsIDOMMozSmsMessage.
   nsIDOMDOMCursor getMessages(in nsIDOMMozSmsFilter filter, in boolean reverse);
 
-  nsIDOMMozSmsRequest markMessageRead(in long id, in boolean aValue);
+  nsIDOMDOMRequest markMessageRead(in long id, in boolean aValue);
 
   // Iterates through nsIDOMMozMobileMessageThread.
   nsIDOMDOMCursor getThreads();
 
   [implicit_jscontext] attribute jsval onreceived;
   [implicit_jscontext] attribute jsval onsending;
   [implicit_jscontext] attribute jsval onsent;
   [implicit_jscontext] attribute jsval onfailed;
deleted file mode 100644
--- a/dom/mobilemessage/interfaces/nsIDOMSmsRequest.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsIDOMDOMRequest.idl"
-
-[scriptable, builtinclass, uuid(ae6acad4-3174-44d6-a491-9ff94ab847c2)]
-interface nsIDOMMozSmsRequest : nsIDOMDOMRequest
-{
-};
--- a/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl
+++ b/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl
@@ -12,17 +12,17 @@ dictionary SmsThreadListItem
   DOMString body;
   unsigned long long unreadCount;
 };
 
 [scriptable, builtinclass, uuid(5e993cfc-fb34-46a8-bb14-3df5c09ff748)]
 interface nsIMobileMessageCallback : nsISupports
 {
   /**
-   * All SMS related errors that could apply to SmsRequest objects.
+   * All SMS related errors.
    * Make sure to keep this list in sync with the list in:
    * embedding/android/GeckoSmsManager.java
    */
   const unsigned short SUCCESS_NO_ERROR = 0;
   const unsigned short NO_SIGNAL_ERROR  = 1;
   const unsigned short NOT_FOUND_ERROR  = 2;
   const unsigned short UNKNOWN_ERROR    = 3;
   const unsigned short INTERNAL_ERROR   = 4;