diff --git a/dom/sms/interfaces/nsIDOMSmsFilter.idl b/dom/sms/interfaces/nsIDOMSmsFilter.idl index 67db17b443f8..f8682518b65b 100644 --- a/dom/sms/interfaces/nsIDOMSmsFilter.idl +++ b/dom/sms/interfaces/nsIDOMSmsFilter.idl @@ -1,42 +1,10 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org. - * - * The Initial Developer of the Original Code is Mozilla Foundation - * Portions created by the Initial Developer are Copyright (C) 2011 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Mounir Lamouri (Original Author) - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ +/* 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 "nsISupports.idl" -[scriptable, builtinclass, uuid(7da08e45-ee81-4293-912b-2f2fea5b6935)] +[scriptable, builtinclass, uuid(ce055c33-553d-4b0e-9bd8-91d93a057c90)] interface nsIDOMMozSmsFilter : nsISupports { // A date that can return null. @@ -54,4 +22,8 @@ interface nsIDOMMozSmsFilter : nsISupports // A DOMString that can return and be set to "sent", "received" or null. [Null(Empty)] attribute DOMString delivery; + + // A read flag that can be a boolean or undefined. + [implicit_jscontext] + attribute jsval read; }; diff --git a/dom/sms/interfaces/nsIDOMSmsManager.idl b/dom/sms/interfaces/nsIDOMSmsManager.idl index 63228d2e85fe..57cc33b8c198 100644 --- a/dom/sms/interfaces/nsIDOMSmsManager.idl +++ b/dom/sms/interfaces/nsIDOMSmsManager.idl @@ -1,38 +1,6 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org. - * - * The Initial Developer of the Original Code is Mozilla Foundation - * Portions created by the Initial Developer are Copyright (C) 2011 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Mounir Lamouri (Original Author) - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ +/* 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" @@ -40,7 +8,7 @@ interface nsIDOMEventListener; interface nsIDOMMozSmsRequest; interface nsIDOMMozSmsFilter; -[scriptable, uuid(c9916dce-2947-41bb-95c2-818f792a020c)] +[scriptable, uuid(6363c0ff-b58f-4fb3-9707-0ba27f120b2c)] interface nsIDOMMozSmsManager : nsIDOMEventTarget { unsigned short getNumberOfMessagesForText(in DOMString text); @@ -58,6 +26,8 @@ interface nsIDOMMozSmsManager : nsIDOMEventTarget nsIDOMMozSmsRequest getMessages(in nsIDOMMozSmsFilter filter, in boolean reverse); + nsIDOMMozSmsRequest markMessageRead(in long id, in boolean aValue); + attribute nsIDOMEventListener onreceived; attribute nsIDOMEventListener onsent; attribute nsIDOMEventListener ondelivered; diff --git a/dom/sms/interfaces/nsIDOMSmsMessage.idl b/dom/sms/interfaces/nsIDOMSmsMessage.idl index 1e4cf32fd1b6..eb699182011c 100644 --- a/dom/sms/interfaces/nsIDOMSmsMessage.idl +++ b/dom/sms/interfaces/nsIDOMSmsMessage.idl @@ -1,43 +1,10 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org. - * - * The Initial Developer of the Original Code is Mozilla Foundation - * Portions created by the Initial Developer are Copyright (C) 2011 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Mounir Lamouri (Original Author) - * Philipp von Weitershausen - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ +/* 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 "nsISupports.idl" -[scriptable, builtinclass, uuid(20da0c51-2224-49ae-afe9-4b309c6d8f84)] +[scriptable, builtinclass, uuid(fc58ba6e-70de-4550-aa1e-790ecc19cf98)] interface nsIDOMMozSmsMessage : nsISupports { // TODO: we should add SENT and RECEIVED DOMString constants, see bug 443316. @@ -49,4 +16,5 @@ interface nsIDOMMozSmsMessage : nsISupports readonly attribute DOMString body; [implicit_jscontext] readonly attribute jsval timestamp; // jsval is for Date. + readonly attribute boolean read; }; diff --git a/dom/sms/interfaces/nsISmsDatabaseService.idl b/dom/sms/interfaces/nsISmsDatabaseService.idl index 80b436b297f5..22b8374c018f 100644 --- a/dom/sms/interfaces/nsISmsDatabaseService.idl +++ b/dom/sms/interfaces/nsISmsDatabaseService.idl @@ -1,38 +1,6 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org. - * - * The Initial Developer of the Original Code is Mozilla Foundation - * Portions created by the Initial Developer are Copyright (C) 2011 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Mounir Lamouri (Original Author) - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ +/* 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 "nsISupports.idl" @@ -45,7 +13,7 @@ interface nsIDOMMozSmsFilter; -[scriptable, uuid(74d6ff05-818a-4179-a745-6258e1c3cd08)] +[scriptable, uuid(30e8cdfb-155d-44c7-8fb3-6bcd9c1c3f99)] interface nsISmsDatabaseService : nsISupports { // Takes some information required to save the message and returns its id. @@ -59,4 +27,5 @@ interface nsISmsDatabaseService : nsISupports void createMessageList(in nsIDOMMozSmsFilter filter, in boolean reverse, in long requestId, [optional] in unsigned long long processId); void getNextMessageInList(in long listId, in long requestId, [optional] in unsigned long long processId); void clearMessageList(in long listId); + void markMessageRead(in long messageId, in boolean value, in long requestId, [optional] in unsigned long long processId); }; diff --git a/dom/sms/interfaces/nsISmsRequestManager.idl b/dom/sms/interfaces/nsISmsRequestManager.idl index dbe3e0fa3e10..631af37f1b12 100644 --- a/dom/sms/interfaces/nsISmsRequestManager.idl +++ b/dom/sms/interfaces/nsISmsRequestManager.idl @@ -15,7 +15,7 @@ interface nsIDOMMozSmsManager; #define SMS_REQUEST_MANAGER_CONTRACTID "@mozilla.org/sms/smsrequestmanager;1" %} -[scriptable, uuid(1638b963-3a45-4937-b6a9-280c1bfb166c)] +[scriptable, uuid(be747cca-ba07-410a-8b91-2754d5406d66)] interface nsISmsRequestManager : nsISupports { @@ -75,4 +75,9 @@ interface nsISmsRequestManager : nsISupports void notifyReadMessageListFailed(in long aRequestId, in long aError); + void notifyMarkedMessageRead(in long aRequestId, + in bool aRead); + + void notifyMarkMessageReadFailed(in long aRequestId, + in long aError); }; diff --git a/dom/sms/interfaces/nsISmsService.idl b/dom/sms/interfaces/nsISmsService.idl index cb1bae32bf82..9551738dca23 100644 --- a/dom/sms/interfaces/nsISmsService.idl +++ b/dom/sms/interfaces/nsISmsService.idl @@ -1,39 +1,6 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org. - * - * The Initial Developer of the Original Code is Mozilla Foundation - * Portions created by the Initial Developer are Copyright (C) 2011 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Mounir Lamouri (Original Author) - * Philipp von Weitershausen - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ +/* 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 "nsISupports.idl" @@ -44,7 +11,7 @@ interface nsIDOMMozSmsMessage; #define SMS_SERVICE_CONTRACTID "@mozilla.org/sms/smsservice;1" %} -[scriptable, builtinclass, uuid(a0fbbe74-5d61-4b7e-b7ab-9b5224f9e5e9)] +[scriptable, builtinclass, uuid(00d23a50-6ed1-48b4-b1e9-5987b155e54b)] interface nsISmsService : nsISupports { boolean hasSupport(); @@ -58,5 +25,6 @@ interface nsISmsService : nsISupports in DOMString sender, in DOMString receiver, in DOMString body, - in jsval timestamp); + in jsval timestamp, + in bool read); };