Bug 844431 - B2G MMS: provide nsIDOMMobileMessageManager interface (with sendMMS() first) (part 3-1, s/nsISmsRequest/nsIMobileMessageCallback). r=vicamo a=leo+

dom/mobilemessage/interfaces/moz.build

@@ -15,8 +15,8 @@ XPIDL_SOURCES += [
     'nsIDOMSmsManager.idl',
     'nsIDOMSmsRequest.idl',
     'nsIDOMSmsSegmentInfo.idl',
+    'nsIMobileMessageCallback.idl',
     'nsIMobileMessageDatabaseService.idl',
-    'nsISmsRequest.idl',
     'nsISmsService.idl',
 ]
 

dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl

@@ -14,8 +14,8 @@ dictionary SmsThreadListItem
   unsigned long long unreadCount;
 };
 
-[scriptable, builtinclass, uuid(82a6d16d-cf33-4745-8662-8b5d441f512f)]
+[scriptable, builtinclass, uuid(9b4f6e3e-8577-11e2-83c1-e3a75aac027d)]
-interface nsISmsRequest : nsISupports
+interface nsIMobileMessageCallback : nsISupports
 {
   /**
    * All SMS related errors that could apply to SmsRequest objects.

dom/mobilemessage/interfaces/nsIMobileMessageDatabaseService.idl

@@ -12,18 +12,30 @@
 %}
 
 interface nsIDOMMozSmsFilter;
-interface nsISmsRequest;
+interface nsIMobileMessageCallback;
 
-[scriptable, uuid(ce9232ca-6a08-11e2-b971-c795004622e7)]
+[scriptable, uuid(4000064a-86d2-11e2-b4a6-ef0f30bd1e59)]
 interface nsIMobileMessageDatabaseService : nsISupports
 {
   [binaryname(GetMessageMoz)]
-  void getMessage(in long messageId, in nsISmsRequest request);
+  void getMessage(in long messageId,
-  void deleteMessage(in long messageId, in nsISmsRequest request);
+                  in nsIMobileMessageCallback request);
-  void createMessageList(in nsIDOMMozSmsFilter filter, in boolean reverse, in nsISmsRequest request);
-  void getNextMessageInList(in long listId, in nsISmsRequest request);
-  void clearMessageList(in long listId);
-  void markMessageRead(in long messageId, in boolean value, in nsISmsRequest request);
 
-  void getThreadList(in nsISmsRequest request);
+  void deleteMessage(in long messageId,
+                     in nsIMobileMessageCallback request);
+
+  void createMessageList(in nsIDOMMozSmsFilter filter,
+                         in boolean reverse,
+                         in nsIMobileMessageCallback request);
+
+  void getNextMessageInList(in long listId,
+                            in nsIMobileMessageCallback request);
+
+  void clearMessageList(in long listId);
+
+  void markMessageRead(in long messageId,
+                       in boolean value,
+                       in nsIMobileMessageCallback request);
+
+  void getThreadList(in nsIMobileMessageCallback request);
 };

dom/mobilemessage/interfaces/nsISmsService.idl

@@ -6,14 +6,14 @@
 
 interface nsIDOMMozSmsMessage;
 interface nsIDOMMozSmsSegmentInfo;
-interface nsISmsRequest;
+interface nsIMobileMessageCallback;
 
 %{C++
 #define SMS_SERVICE_CID { 0xbada3cb8, 0xa568, 0x4dff, { 0xb5, 0x43, 0x52, 0xbb, 0xb3, 0x14, 0x31, 0x21 } }
 #define SMS_SERVICE_CONTRACTID "@mozilla.org/sms/smsservice;1"
 %}
 
-[scriptable, builtinclass, uuid(4310bdb5-eefa-4f70-965a-74041228ab26)]
+[scriptable, builtinclass, uuid(5d066568-86d2-11e2-a0d0-7351fb5ae50a)]
 interface nsISmsService : nsISupports
 {
   boolean hasSupport();
@@ -22,7 +22,7 @@ interface nsISmsService : nsISupports
 
   void send(in DOMString number,
             in DOMString message,
-            in nsISmsRequest request);
+            in nsIMobileMessageCallback request);
 
   [implicit_jscontext]
   nsIDOMMozSmsMessage createSmsMessage(in long      id,

dom/mobilemessage/src/MobileMessageManager.cpp

@@ -111,7 +111,7 @@ MobileMessageManager::Send(JSContext* aCx, JSObject* aGlobal, JSString* aNumber,
   nsDependentJSString number;
   number.init(aCx, aNumber);
 
-  nsCOMPtr<nsISmsRequest> forwarder =
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
     new SmsRequestForwarder(static_cast<SmsRequest*>(request.get()));
 
   smsService->Send(number, aMessage, forwarder);
@@ -180,7 +180,8 @@ MobileMessageManager::GetMessageMoz(int32_t aId, nsIDOMMozSmsRequest** aRequest)
   nsCOMPtr<nsIMobileMessageDatabaseService> mobileMessageDBService =
     do_GetService(MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(mobileMessageDBService, NS_ERROR_FAILURE);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
+    new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
   mobileMessageDBService->GetMessageMoz(aId, forwarder);
   req.forget(aRequest);
   return NS_OK;
@@ -194,7 +195,8 @@ MobileMessageManager::Delete(int32_t aId, nsIDOMMozSmsRequest** aRequest)
     do_GetService(MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(mobileMessageDBService, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
+    new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
   mobileMessageDBService->DeleteMessage(aId, forwarder);
   req.forget(aRequest);
   return NS_OK;
@@ -239,7 +241,8 @@ MobileMessageManager::GetMessages(nsIDOMMozSmsFilter* aFilter, bool aReverse,
   nsCOMPtr<nsIMobileMessageDatabaseService> mobileMessageDBService =
     do_GetService(MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(mobileMessageDBService, NS_ERROR_FAILURE);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
+    new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
   mobileMessageDBService->CreateMessageList(filter, aReverse, forwarder);
   req.forget(aRequest);
   return NS_OK;
@@ -253,7 +256,7 @@ MobileMessageManager::MarkMessageRead(int32_t aId, bool aValue,
   nsCOMPtr<nsIMobileMessageDatabaseService> mobileMessageDBService =
     do_GetService(MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(mobileMessageDBService, NS_ERROR_FAILURE);
-  nsCOMPtr<nsISmsRequest> forwarder =
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
     new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
   mobileMessageDBService->MarkMessageRead(aId, aValue, forwarder);
   req.forget(aRequest);
@@ -267,7 +270,7 @@ MobileMessageManager::GetThreadList(nsIDOMMozSmsRequest** aRequest)
   nsCOMPtr<nsIMobileMessageDatabaseService> mobileMessageDBService =
     do_GetService(MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(mobileMessageDBService, NS_ERROR_FAILURE);
-  nsCOMPtr<nsISmsRequest> forwarder =
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
     new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
   mobileMessageDBService->GetThreadList(forwarder);
   req.forget(aRequest);

dom/mobilemessage/src/SmsCursor.cpp

@@ -31,7 +31,7 @@ SmsCursor::SmsCursor()
 {
 }
 
-SmsCursor::SmsCursor(int32_t aListId, nsISmsRequest* aRequest)
+SmsCursor::SmsCursor(int32_t aListId, nsIMobileMessageCallback* aRequest)
   : mListId(aListId)
   , mRequest(aRequest)
 {
@@ -86,7 +86,7 @@ SmsCursor::Continue()
     do_GetService(MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(mobileMessageDBService, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(request);
+  nsCOMPtr<nsIMobileMessageCallback> forwarder = new SmsRequestForwarder(request);
   mobileMessageDBService->GetNextMessageInList(mListId, forwarder);
 
   // We intenionally increase the refcount. The release will be called

dom/mobilemessage/src/SmsCursor.h

@@ -12,7 +12,7 @@
 #include "mozilla/Attributes.h"
 
 class nsIDOMMozSmsMessage;
-class nsISmsRequest;
+class nsIMobileMessageCallback;
 
 namespace mozilla {
 namespace dom {
@@ -26,7 +26,7 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS(SmsCursor)
 
   SmsCursor();
-  SmsCursor(int32_t aListId, nsISmsRequest* aRequest);
+  SmsCursor(int32_t aListId, nsIMobileMessageCallback* aRequest);
 
   ~SmsCursor();
 
@@ -35,9 +35,9 @@ public:
   void Disconnect();
 
 private:
-  int32_t                       mListId;
+  int32_t                            mListId;
-  nsCOMPtr<nsISmsRequest>       mRequest;
+  nsCOMPtr<nsIMobileMessageCallback> mRequest;
-  nsCOMPtr<nsIDOMMozSmsMessage> mMessage;
+  nsCOMPtr<nsIDOMMozSmsMessage>      mMessage;
 };
 
 inline void

dom/mobilemessage/src/SmsManager.cpp

@@ -152,7 +152,7 @@ SmsManager::Send(JSContext* aCx, JSObject* aGlobal, JSString* aNumber,
   nsDependentJSString number;
   number.init(aCx, aNumber);
 
-  nsCOMPtr<nsISmsRequest> forwarder =
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
     new SmsRequestForwarder(static_cast<SmsRequest*>(request.get()));
 
   smsService->Send(number, aMessage, forwarder);
@@ -221,7 +221,8 @@ SmsManager::GetMessageMoz(int32_t aId, nsIDOMMozSmsRequest** aRequest)
   nsCOMPtr<nsIMobileMessageDatabaseService> mobileMessageDBService =
     do_GetService(MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(mobileMessageDBService, NS_ERROR_FAILURE);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
+    new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
   mobileMessageDBService->GetMessageMoz(aId, forwarder);
   req.forget(aRequest);
   return NS_OK;
@@ -235,7 +236,8 @@ SmsManager::Delete(int32_t aId, nsIDOMMozSmsRequest** aRequest)
     do_GetService(MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(mobileMessageDBService, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
+    new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
   mobileMessageDBService->DeleteMessage(aId, forwarder);
   req.forget(aRequest);
   return NS_OK;
@@ -280,7 +282,8 @@ SmsManager::GetMessages(nsIDOMMozSmsFilter* aFilter, bool aReverse,
   nsCOMPtr<nsIMobileMessageDatabaseService> mobileMessageDBService =
     do_GetService(MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(mobileMessageDBService, NS_ERROR_FAILURE);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
+    new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
   mobileMessageDBService->CreateMessageList(filter, aReverse, forwarder);
   req.forget(aRequest);
   return NS_OK;
@@ -294,7 +297,7 @@ SmsManager::MarkMessageRead(int32_t aId, bool aValue,
   nsCOMPtr<nsIMobileMessageDatabaseService> mobileMessageDBService =
     do_GetService(MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(mobileMessageDBService, NS_ERROR_FAILURE);
-  nsCOMPtr<nsISmsRequest> forwarder =
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
     new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
   mobileMessageDBService->MarkMessageRead(aId, aValue, forwarder);
   req.forget(aRequest);
@@ -308,7 +311,7 @@ SmsManager::GetThreadList(nsIDOMMozSmsRequest** aRequest)
   nsCOMPtr<nsIMobileMessageDatabaseService> mobileMessageDBService =
     do_GetService(MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(mobileMessageDBService, NS_ERROR_FAILURE);
-  nsCOMPtr<nsISmsRequest> forwarder =
+  nsCOMPtr<nsIMobileMessageCallback> forwarder =
     new SmsRequestForwarder(static_cast<SmsRequest*>(req.get()));
   mobileMessageDBService->GetThreadList(forwarder);
   req.forget(aRequest);

dom/mobilemessage/src/SmsRequest.cpp

@@ -31,7 +31,7 @@ DOMCI_DATA(MozSmsRequest, mozilla::dom::SmsRequest)
 namespace mozilla {
 namespace dom {
 
-NS_IMPL_ISUPPORTS1(SmsRequestForwarder, nsISmsRequest)
+NS_IMPL_ISUPPORTS1(SmsRequestForwarder, nsIMobileMessageCallback)
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(SmsRequest,
                                                   nsDOMEventTargetHelper)
@@ -57,7 +57,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_END
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(SmsRequest)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMozSmsRequest)
   NS_INTERFACE_MAP_ENTRY(nsIDOMDOMRequest)
-  NS_INTERFACE_MAP_ENTRY(nsISmsRequest)
+  NS_INTERFACE_MAP_ENTRY(nsIMobileMessageCallback)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozSmsRequest)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
 
@@ -205,7 +205,7 @@ SmsRequest::SetSuccessInternal(nsISupports* aObject)
   nsresult rv;
   nsIScriptContext* sc = GetContextForEventHandlers(&rv);
   if (!sc) {
-    SetError(nsISmsRequest::INTERNAL_ERROR);
+    SetError(nsIMobileMessageCallback::INTERNAL_ERROR);
     return false;
   }
 
@@ -222,7 +222,7 @@ SmsRequest::SetSuccessInternal(nsISupports* aObject)
 
   if (NS_FAILED(nsContentUtils::WrapNative(cx, global, aObject, &mResult))) {
     UnrootResult();
-    SetError(nsISmsRequest::INTERNAL_ERROR);
+    SetError(nsIMobileMessageCallback::INTERNAL_ERROR);
     return false;
   }
 
@@ -236,23 +236,23 @@ SmsRequest::SetError(int32_t aError)
   NS_PRECONDITION(!mDone, "mDone shouldn't have been set to true already!");
   NS_PRECONDITION(!mError, "mError shouldn't have been set!");
   NS_PRECONDITION(mResult == JSVAL_VOID, "mResult shouldn't have been set!");
-  NS_PRECONDITION(aError != nsISmsRequest::SUCCESS_NO_ERROR,
+  NS_PRECONDITION(aError != nsIMobileMessageCallback::SUCCESS_NO_ERROR,
                   "Can't call SetError() with SUCCESS_NO_ERROR!");
 
   mDone = true;
   mCursor = nullptr;
 
   switch (aError) {
-    case nsISmsRequest::NO_SIGNAL_ERROR:
+    case nsIMobileMessageCallback::NO_SIGNAL_ERROR:
       mError = DOMError::CreateWithName(NS_LITERAL_STRING("NoSignalError"));
       break;
-    case nsISmsRequest::NOT_FOUND_ERROR:
+    case nsIMobileMessageCallback::NOT_FOUND_ERROR:
       mError = DOMError::CreateWithName(NS_LITERAL_STRING("NotFoundError"));
       break;
-    case nsISmsRequest::UNKNOWN_ERROR:
+    case nsIMobileMessageCallback::UNKNOWN_ERROR:
       mError = DOMError::CreateWithName(NS_LITERAL_STRING("UnknownError"));
       break;
-    case nsISmsRequest::INTERNAL_ERROR:
+    case nsIMobileMessageCallback::INTERNAL_ERROR:
       mError = DOMError::CreateWithName(NS_LITERAL_STRING("InternalError"));
       break;
     default: // SUCCESS_NO_ERROR is handled above.

dom/mobilemessage/src/SmsRequest.h

@@ -7,7 +7,7 @@
 #define mozilla_dom_mobilemessage_SmsRequest_h
 
 #include "nsIDOMSmsRequest.h"
-#include "nsISmsRequest.h"
+#include "nsIMobileMessageCallback.h"
 #include "nsDOMEventTargetHelper.h"
 
 class nsIDOMMozSmsMessage;
@@ -25,15 +25,15 @@ namespace mobilemessage {
 
 // We need this forwarder to avoid a QI to nsIClassInfo.
 // See: https://bugzilla.mozilla.org/show_bug.cgi?id=775997#c51 
-class SmsRequestForwarder : public nsISmsRequest
+class SmsRequestForwarder : public nsIMobileMessageCallback
 {
   friend class mobilemessage::SmsRequestChild;
 
 public:
   NS_DECL_ISUPPORTS
-  NS_FORWARD_NSISMSREQUEST(mRealRequest->)
+  NS_FORWARD_NSIMOBILEMESSAGECALLBACK(mRealRequest->)
 
-  SmsRequestForwarder(nsISmsRequest* aRealRequest) {
+  SmsRequestForwarder(nsIMobileMessageCallback* aRealRequest) {
     mRealRequest = aRealRequest;
   }
 
@@ -41,11 +41,11 @@ private:
   virtual
   ~SmsRequestForwarder() {}
 
-  nsISmsRequest* GetRealRequest() {
+  nsIMobileMessageCallback* GetRealRequest() {
     return mRealRequest;
   }
 
-  nsCOMPtr<nsISmsRequest> mRealRequest;
+  nsCOMPtr<nsIMobileMessageCallback> mRealRequest;
 };
 
 class SmsManager;
@@ -53,14 +53,14 @@ class MobileMessageManager;
 
 class SmsRequest : public nsDOMEventTargetHelper
                  , public nsIDOMMozSmsRequest
-                 , public nsISmsRequest
+                 , public nsIMobileMessageCallback
 {
 public:
   friend class SmsCursor;
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMDOMREQUEST
-  NS_DECL_NSISMSREQUEST
+  NS_DECL_NSIMOBILEMESSAGECALLBACK
   NS_DECL_NSIDOMMOZSMSREQUEST
 
   NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)

dom/mobilemessage/src/android/MobileMessageDatabaseService.cpp

@@ -14,7 +14,8 @@ namespace mobilemessage {
 NS_IMPL_ISUPPORTS1(MobileMessageDatabaseService, nsIMobileMessageDatabaseService)
 
 NS_IMETHODIMP
-MobileMessageDatabaseService::GetMessageMoz(int32_t aMessageId, nsISmsRequest* aRequest)
+MobileMessageDatabaseService::GetMessageMoz(int32_t aMessageId,
+                                            nsIMobileMessageCallback* aRequest)
 {
   if (!AndroidBridge::Bridge()) {
     return NS_OK;
@@ -25,7 +26,8 @@ MobileMessageDatabaseService::GetMessageMoz(int32_t aMessageId, nsISmsRequest* a
 }
 
 NS_IMETHODIMP
-MobileMessageDatabaseService::DeleteMessage(int32_t aMessageId, nsISmsRequest* aRequest)
+MobileMessageDatabaseService::DeleteMessage(int32_t aMessageId,
+                                            nsIMobileMessageCallback* aRequest)
 {
   if (!AndroidBridge::Bridge()) {
     return NS_OK;
@@ -37,7 +39,8 @@ MobileMessageDatabaseService::DeleteMessage(int32_t aMessageId, nsISmsRequest* a
 
 NS_IMETHODIMP
 MobileMessageDatabaseService::CreateMessageList(nsIDOMMozSmsFilter* aFilter,
-                                                bool aReverse, nsISmsRequest* aRequest)
+                                                bool aReverse,
+                                                nsIMobileMessageCallback* aRequest)
 {
   if (!AndroidBridge::Bridge()) {
     return NS_OK;
@@ -49,7 +52,8 @@ MobileMessageDatabaseService::CreateMessageList(nsIDOMMozSmsFilter* aFilter,
 }
 
 NS_IMETHODIMP
-MobileMessageDatabaseService::GetNextMessageInList(int32_t aListId, nsISmsRequest* aRequest)
+MobileMessageDatabaseService::GetNextMessageInList(int32_t aListId,
+                                                   nsIMobileMessageCallback* aRequest)
 {
   if (!AndroidBridge::Bridge()) {
     return NS_OK;
@@ -71,15 +75,16 @@ MobileMessageDatabaseService::ClearMessageList(int32_t aListId)
 }
 
 NS_IMETHODIMP
-MobileMessageDatabaseService::MarkMessageRead(int32_t aMessageId, bool aValue,
+MobileMessageDatabaseService::MarkMessageRead(int32_t aMessageId,
-                                              nsISmsRequest* aRequest)
+                                              bool aValue,
+                                              nsIMobileMessageCallback* aRequest)
 {
   // TODO: This would need to be implemented as part of Bug 748391
   return NS_OK;
 }
 
 NS_IMETHODIMP
-MobileMessageDatabaseService::GetThreadList(nsISmsRequest* aRequest)
+MobileMessageDatabaseService::GetThreadList(nsIMobileMessageCallback* aRequest)
 {
   NS_NOTYETIMPLEMENTED("Implement me!");
   return NS_ERROR_NOT_IMPLEMENTED;

dom/mobilemessage/src/android/SmsService.cpp

@@ -41,7 +41,7 @@ SmsService::GetSegmentInfoForText(const nsAString & aText,
 
 NS_IMETHODIMP
 SmsService::Send(const nsAString& aNumber, const nsAString& aMessage,
-                 nsISmsRequest* aRequest)
+                 nsIMobileMessageCallback* aRequest)
 {
   if (!AndroidBridge::Bridge()) {
     return NS_OK;

dom/mobilemessage/src/fallback/MobileMessageDatabaseService.cpp

@@ -13,7 +13,7 @@ NS_IMPL_ISUPPORTS1(MobileMessageDatabaseService, nsIMobileMessageDatabaseService
 
 NS_IMETHODIMP
 MobileMessageDatabaseService::GetMessageMoz(int32_t aMessageId,
-                                            nsISmsRequest* aRequest)
+                                            nsIMobileMessageCallback* aRequest)
 {
   NS_ERROR("We should not be here!");
   return NS_OK;
@@ -21,7 +21,7 @@ MobileMessageDatabaseService::GetMessageMoz(int32_t aMessageId,
 
 NS_IMETHODIMP
 MobileMessageDatabaseService::DeleteMessage(int32_t aMessageId,
-                                            nsISmsRequest* aRequest)
+                                            nsIMobileMessageCallback* aRequest)
 {
   NS_ERROR("We should not be here!");
   return NS_OK;
@@ -30,7 +30,7 @@ MobileMessageDatabaseService::DeleteMessage(int32_t aMessageId,
 NS_IMETHODIMP
 MobileMessageDatabaseService::CreateMessageList(nsIDOMMozSmsFilter* aFilter,
                                                 bool aReverse,
-                                                nsISmsRequest* aRequest)
+                                                nsIMobileMessageCallback* aRequest)
 {
   NS_ERROR("We should not be here!");
   return NS_OK;
@@ -38,7 +38,7 @@ MobileMessageDatabaseService::CreateMessageList(nsIDOMMozSmsFilter* aFilter,
 
 NS_IMETHODIMP
 MobileMessageDatabaseService::GetNextMessageInList(int32_t aListId,
-                                                   nsISmsRequest* aRequest)
+                                                   nsIMobileMessageCallback* aRequest)
 {
   NS_ERROR("We should not be here!");
   return NS_OK;
@@ -54,14 +54,14 @@ MobileMessageDatabaseService::ClearMessageList(int32_t aListId)
 NS_IMETHODIMP
 MobileMessageDatabaseService::MarkMessageRead(int32_t aMessageId,
                                               bool aValue,
-                                              nsISmsRequest* aRequest)
+                                              nsIMobileMessageCallback* aRequest)
 {
   NS_ERROR("We should not be here!");
   return NS_OK;
 }
 
 NS_IMETHODIMP
-MobileMessageDatabaseService::GetThreadList(nsISmsRequest* aRequest)
+MobileMessageDatabaseService::GetThreadList(nsIMobileMessageCallback* aRequest)
 {
   NS_ERROR("We should not be here!");
   return NS_OK;

dom/mobilemessage/src/fallback/SmsService.cpp

@@ -32,7 +32,7 @@ SmsService::GetSegmentInfoForText(const nsAString & aText,
 NS_IMETHODIMP
 SmsService::Send(const nsAString& aNumber,
                  const nsAString& aMessage,
-                 nsISmsRequest* aRequest)
+                 nsIMobileMessageCallback* aRequest)
 {
   NS_ERROR("We should not be here!");
   return NS_OK;

dom/mobilemessage/src/ipc/SmsChild.cpp

@@ -110,7 +110,7 @@ SmsChild::DeallocPSmsRequest(PSmsRequestChild* aActor)
  * SmsRequestChild
  ******************************************************************************/
 
-SmsRequestChild::SmsRequestChild(nsISmsRequest* aReplyRequest)
+SmsRequestChild::SmsRequestChild(nsIMobileMessageCallback* aReplyRequest)
 : mReplyRequest(aReplyRequest)
 {
   MOZ_COUNT_CTOR(SmsRequestChild);

dom/mobilemessage/src/ipc/SmsChild.h

@@ -9,7 +9,7 @@
 #include "mozilla/dom/mobilemessage/PSmsChild.h"
 #include "mozilla/dom/mobilemessage/PSmsRequestChild.h"
 
-class nsISmsRequest;
+class nsIMobileMessageCallback;
 
 namespace mozilla {
 namespace dom {
@@ -55,10 +55,10 @@ class SmsRequestChild : public PSmsRequestChild
 {
   friend class SmsChild;
 
-  nsCOMPtr<nsISmsRequest> mReplyRequest;
+  nsCOMPtr<nsIMobileMessageCallback> mReplyRequest;
 
 public:
-  SmsRequestChild(nsISmsRequest* aReplyRequest);
+  SmsRequestChild(nsIMobileMessageCallback* aReplyRequest);
 
 protected:
   virtual ~SmsRequestChild();

dom/mobilemessage/src/ipc/SmsIPCService.cpp

@@ -22,7 +22,7 @@ PSmsChild* gSmsChild;
 NS_IMPL_ISUPPORTS2(SmsIPCService, nsISmsService, nsIMobileMessageDatabaseService)
 
 void
-SendRequest(const IPCSmsRequest& aRequest, nsISmsRequest* aRequestReply)
+SendRequest(const IPCSmsRequest& aRequest, nsIMobileMessageCallback* aRequestReply)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -73,7 +73,7 @@ SmsIPCService::GetSegmentInfoForText(const nsAString & aText,
 NS_IMETHODIMP
 SmsIPCService::Send(const nsAString& aNumber,
                     const nsAString& aMessage,
-                    nsISmsRequest* aRequest)
+                    nsIMobileMessageCallback* aRequest)
 {
   SendRequest(SendMessageRequest(nsString(aNumber), nsString(aMessage)), aRequest);
   return NS_OK;
@@ -115,7 +115,7 @@ SmsIPCService::CreateSmsSegmentInfo(int32_t aSegments,
  */
 NS_IMETHODIMP
 SmsIPCService::GetMessageMoz(int32_t aMessageId,
-                             nsISmsRequest* aRequest)
+                             nsIMobileMessageCallback* aRequest)
 {
   SendRequest(GetMessageRequest(aMessageId), aRequest);
   return NS_OK;
@@ -123,7 +123,7 @@ SmsIPCService::GetMessageMoz(int32_t aMessageId,
 
 NS_IMETHODIMP
 SmsIPCService::DeleteMessage(int32_t aMessageId,
-                             nsISmsRequest* aRequest)
+                             nsIMobileMessageCallback* aRequest)
 {
   SendRequest(DeleteMessageRequest(aMessageId), aRequest);
   return NS_OK;
@@ -132,7 +132,7 @@ SmsIPCService::DeleteMessage(int32_t aMessageId,
 NS_IMETHODIMP
 SmsIPCService::CreateMessageList(nsIDOMMozSmsFilter* aFilter,
                                  bool aReverse,
-                                 nsISmsRequest* aRequest)
+                                 nsIMobileMessageCallback* aRequest)
 {
   SmsFilterData data = SmsFilterData(static_cast<SmsFilter*>(aFilter)->GetData());
   SendRequest(CreateMessageListRequest(data, aReverse), aRequest);
@@ -141,7 +141,7 @@ SmsIPCService::CreateMessageList(nsIDOMMozSmsFilter* aFilter,
 
 NS_IMETHODIMP
 SmsIPCService::GetNextMessageInList(int32_t aListId,
-                                    nsISmsRequest* aRequest)
+                                    nsIMobileMessageCallback* aRequest)
 {
   SendRequest(GetNextMessageInListRequest(aListId), aRequest);
   return NS_OK;
@@ -157,14 +157,14 @@ SmsIPCService::ClearMessageList(int32_t aListId)
 NS_IMETHODIMP
 SmsIPCService::MarkMessageRead(int32_t aMessageId,
                                bool aValue,
-                               nsISmsRequest* aRequest)
+                               nsIMobileMessageCallback* aRequest)
 {
   SendRequest(MarkMessageReadRequest(aMessageId, aValue), aRequest);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-SmsIPCService::GetThreadList(nsISmsRequest* aRequest)
+SmsIPCService::GetThreadList(nsIMobileMessageCallback* aRequest)
 {
   SendRequest(GetThreadListRequest(), aRequest);
   return NS_OK;

dom/mobilemessage/src/ipc/SmsParent.cpp

@@ -266,7 +266,7 @@ SmsRequestParent::DoRequest(const SendMessageRequest& aRequest)
   NS_ENSURE_TRUE(smsService, true);
 
   mSmsRequest = SmsRequest::Create(this);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(mSmsRequest);
+  nsCOMPtr<nsIMobileMessageCallback> forwarder = new SmsRequestForwarder(mSmsRequest);
   nsresult rv = smsService->Send(aRequest.number(), aRequest.message(), forwarder);
   NS_ENSURE_SUCCESS(rv, false);
 
@@ -281,7 +281,7 @@ SmsRequestParent::DoRequest(const GetMessageRequest& aRequest)
   NS_ENSURE_TRUE(mobileMessageDBService, true);
 
   mSmsRequest = SmsRequest::Create(this);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(mSmsRequest);
+  nsCOMPtr<nsIMobileMessageCallback> forwarder = new SmsRequestForwarder(mSmsRequest);
   nsresult rv = mobileMessageDBService->GetMessageMoz(aRequest.messageId(), forwarder);
   NS_ENSURE_SUCCESS(rv, false);
 
@@ -296,7 +296,7 @@ SmsRequestParent::DoRequest(const DeleteMessageRequest& aRequest)
   NS_ENSURE_TRUE(mobileMessageDBService, true);
 
   mSmsRequest = SmsRequest::Create(this);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(mSmsRequest);
+  nsCOMPtr<nsIMobileMessageCallback> forwarder = new SmsRequestForwarder(mSmsRequest);
   nsresult rv = mobileMessageDBService->DeleteMessage(aRequest.messageId(), forwarder);
   NS_ENSURE_SUCCESS(rv, false);
 
@@ -311,7 +311,7 @@ SmsRequestParent::DoRequest(const CreateMessageListRequest& aRequest)
 
   NS_ENSURE_TRUE(mobileMessageDBService, true);
   mSmsRequest = SmsRequest::Create(this);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(mSmsRequest);
+  nsCOMPtr<nsIMobileMessageCallback> forwarder = new SmsRequestForwarder(mSmsRequest);
   SmsFilter *filter = new SmsFilter(aRequest.filter());
   nsresult rv = mobileMessageDBService->CreateMessageList(filter, aRequest.reverse(), forwarder);
   NS_ENSURE_SUCCESS(rv, false);
@@ -327,7 +327,7 @@ SmsRequestParent::DoRequest(const GetNextMessageInListRequest& aRequest)
 
   NS_ENSURE_TRUE(mobileMessageDBService, true);
   mSmsRequest = SmsRequest::Create(this);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(mSmsRequest);
+  nsCOMPtr<nsIMobileMessageCallback> forwarder = new SmsRequestForwarder(mSmsRequest);
   nsresult rv = mobileMessageDBService->GetNextMessageInList(aRequest.aListId(), forwarder);
   NS_ENSURE_SUCCESS(rv, false);
 
@@ -342,7 +342,7 @@ SmsRequestParent::DoRequest(const MarkMessageReadRequest& aRequest)
 
   NS_ENSURE_TRUE(mobileMessageDBService, true);
   mSmsRequest = SmsRequest::Create(this);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(mSmsRequest);
+  nsCOMPtr<nsIMobileMessageCallback> forwarder = new SmsRequestForwarder(mSmsRequest);
   nsresult rv = mobileMessageDBService->MarkMessageRead(aRequest.messageId(), aRequest.value(), forwarder);
   NS_ENSURE_SUCCESS(rv, false);
 
@@ -357,7 +357,7 @@ SmsRequestParent::DoRequest(const GetThreadListRequest& aRequest)
 
   NS_ENSURE_TRUE(mobileMessageDBService, true);
   mSmsRequest = SmsRequest::Create(this);
-  nsCOMPtr<nsISmsRequest> forwarder = new SmsRequestForwarder(mSmsRequest);
+  nsCOMPtr<nsIMobileMessageCallback> forwarder = new SmsRequestForwarder(mSmsRequest);
   nsresult rv = mobileMessageDBService->GetThreadList(forwarder);
   NS_ENSURE_SUCCESS(rv, false);
 

dom/mobilemessage/src/ril/MobileMessageDatabaseService.js

@@ -619,7 +619,7 @@ MobileMessageDatabaseService.prototype = {
       // An previous error found. Keep the answer in results so that we can
       // reply INTERNAL_ERROR for further requests.
       if (DEBUG) debug("An previous error found");
-      smsRequest.notifyReadMessageListFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+      smsRequest.notifyReadMessageListFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
       return;
     }
 
@@ -652,7 +652,7 @@ MobileMessageDatabaseService.prototype = {
         debug("notifyReadMessageListFailed - listId: "
               + aMessageList.listId + ", messageId: " + firstMessageId);
       }
-      smsRequest.notifyReadMessageListFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+      smsRequest.notifyReadMessageListFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
     };
   },
 
@@ -1219,7 +1219,7 @@ MobileMessageDatabaseService.prototype = {
     this.newTxn(READ_ONLY, function (error, txn, messageStore) {
       if (error) {
         if (DEBUG) debug(error);
-        aRequest.notifyGetMessageFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyGetMessageFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
         return;
       }
       let request = messageStore.mozGetAll(messageId);
@@ -1228,13 +1228,13 @@ MobileMessageDatabaseService.prototype = {
         if (DEBUG) debug("Transaction " + txn + " completed.");
         if (request.result.length > 1) {
           if (DEBUG) debug("Got too many results for id " + messageId);
-          aRequest.notifyGetMessageFailed(Ci.nsISmsRequest.UNKNOWN_ERROR);
+          aRequest.notifyGetMessageFailed(Ci.nsIMobileMessageCallback.UNKNOWN_ERROR);
           return;
         }
         let messageRecord = request.result[0];
         if (!messageRecord) {
           if (DEBUG) debug("Message ID " + messageId + " not found");
-          aRequest.notifyGetMessageFailed(Ci.nsISmsRequest.NOT_FOUND_ERROR);
+          aRequest.notifyGetMessageFailed(Ci.nsIMobileMessageCallback.NOT_FOUND_ERROR);
           return;
         }
         if (messageRecord.id != messageId) {
@@ -1242,7 +1242,7 @@ MobileMessageDatabaseService.prototype = {
             debug("Requested message ID (" + messageId + ") is " +
                   "different from the one we got");
           }
-          aRequest.notifyGetMessageFailed(Ci.nsISmsRequest.UNKNOWN_ERROR);
+          aRequest.notifyGetMessageFailed(Ci.nsIMobileMessageCallback.UNKNOWN_ERROR);
           return;
         }
         let sms = self.createSmsMessageFromRecord(messageRecord);
@@ -1255,7 +1255,7 @@ MobileMessageDatabaseService.prototype = {
             debug("Caught error on transaction", event.target.errorCode);
         }
         //TODO look at event.target.errorCode, pick appropriate error constant
-        aRequest.notifyGetMessageFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyGetMessageFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
       };
     });
   },
@@ -1265,13 +1265,13 @@ MobileMessageDatabaseService.prototype = {
     let self = this;
     this.newTxn(READ_WRITE, function (error, txn, stores) {
       if (error) {
-        aRequest.notifyDeleteMessageFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyDeleteMessageFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
         return;
       }
       txn.onerror = function onerror(event) {
         if (DEBUG) debug("Caught error on transaction", event.target.errorCode);
         //TODO look at event.target.errorCode, pick appropriate error constant
-        aRequest.notifyDeleteMessageFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyDeleteMessageFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
       };
 
       const messageStore = stores[0];
@@ -1363,7 +1363,7 @@ MobileMessageDatabaseService.prototype = {
       if (error) {
         //TODO look at event.target.errorCode, pick appropriate error constant.
         if (DEBUG) debug("IDBRequest error " + error.target.errorCode);
-        aRequest.notifyReadMessageListFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyReadMessageListFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
         return;
       }
 
@@ -1652,7 +1652,7 @@ MobileMessageDatabaseService.prototype = {
     let list = this.messageLists[listId];
     if (!list) {
       if (DEBUG) debug("Wrong list id");
-      aRequest.notifyReadMessageListFailed(Ci.nsISmsRequest.NOT_FOUND_ERROR);
+      aRequest.notifyReadMessageListFailed(Ci.nsIMobileMessageCallback.NOT_FOUND_ERROR);
       return;
     }
     if (list.processing) {
@@ -1671,7 +1671,7 @@ MobileMessageDatabaseService.prototype = {
       return;
     }
     if (list.results[0] < 0) {
-      aRequest.notifyReadMessageListFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+      aRequest.notifyReadMessageListFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
       return;
     }
     messageId = list.results.shift();
@@ -1688,7 +1688,7 @@ MobileMessageDatabaseService.prototype = {
         if (DEBUG) debug("Transaction " + txn + " completed.");
         if (!messageRecord) {
           if (DEBUG) debug("Could not get message id " + messageId);
-          aRequest.notifyReadMessageListFailed(Ci.nsISmsRequest.NOT_FOUND_ERROR);
+          aRequest.notifyReadMessageListFailed(Ci.nsIMobileMessageCallback.NOT_FOUND_ERROR);
         }
         let sms = self.createSmsMessageFromRecord(messageRecord);
         aRequest.notifyNextMessageInListGot(sms);
@@ -1700,7 +1700,7 @@ MobileMessageDatabaseService.prototype = {
           debug("Error retrieving message id: " + messageId +
                 ". Error code: " + event.target.errorCode);
         }
-        aRequest.notifyReadMessageListFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyReadMessageListFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
       };
     });
   },
@@ -1718,12 +1718,12 @@ MobileMessageDatabaseService.prototype = {
     this.newTxn(READ_WRITE, function (error, txn, stores) {
       if (error) {
         if (DEBUG) debug(error);
-        aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyMarkMessageReadFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
         return;
       }
       txn.onerror = function onerror(event) {
         if (DEBUG) debug("Caught error on transaction ", event.target.errorCode);
-        aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyMarkMessageReadFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
       };
       let messageStore = stores[0];
       let threadStore = stores[1];
@@ -1731,7 +1731,7 @@ MobileMessageDatabaseService.prototype = {
         let messageRecord = event.target.result;
         if (!messageRecord) {
           if (DEBUG) debug("Message ID " + messageId + " not found");
-          aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.NOT_FOUND_ERROR);
+          aRequest.notifyMarkMessageReadFailed(Ci.nsIMobileMessageCallback.NOT_FOUND_ERROR);
           return;
         }
         if (messageRecord.id != messageId) {
@@ -1739,7 +1739,7 @@ MobileMessageDatabaseService.prototype = {
             debug("Retrieve message ID (" + messageId + ") is " +
                   "different from the one we got");
           }
-          aRequest.notifyMarkMessageReadFailed(Ci.nsISmsRequest.UNKNOWN_ERROR);
+          aRequest.notifyMarkMessageReadFailed(Ci.nsIMobileMessageCallback.UNKNOWN_ERROR);
           return;
         }
         // If the value to be set is the same as the current message `read`
@@ -1785,12 +1785,12 @@ MobileMessageDatabaseService.prototype = {
     this.newTxn(READ_ONLY, function (error, txn, threadStore) {
       if (error) {
         if (DEBUG) debug(error);
-        aRequest.notifyThreadListFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyThreadListFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
         return;
       }
       txn.onerror = function onerror(event) {
         if (DEBUG) debug("Caught error on transaction ", event.target.errorCode);
-        aRequest.notifyThreadListFailed(Ci.nsISmsRequest.INTERNAL_ERROR);
+        aRequest.notifyThreadListFailed(Ci.nsIMobileMessageCallback.INTERNAL_ERROR);
       };
       let request = threadStore.index("lastTimestamp").mozGetAll();
       request.onsuccess = function(event) {

dom/mobilemessage/src/ril/SmsService.cpp

@@ -39,7 +39,7 @@ SmsService::GetSegmentInfoForText(const nsAString & aText,
 NS_IMETHODIMP
 SmsService::Send(const nsAString& aNumber,
                  const nsAString& aMessage,
-                 nsISmsRequest* aRequest)
+                 nsIMobileMessageCallback* aRequest)
 {
   if (!mRIL) {
     return NS_OK;

dom/system/gonk/RadioInterfaceLayer.js

@@ -1673,10 +1673,10 @@ RadioInterfaceLayer.prototype = {
     }
     delete this._sentSmsEnvelopes[message.envelopeId];
 
-    let error = Ci.nsISmsRequest.UNKNOWN_ERROR;
+    let error = Ci.nsIMobileMessageCallback.UNKNOWN_ERROR;
     switch (message.errorMsg) {
       case RIL.ERROR_RADIO_NOT_AVAILABLE:
-        error = Ci.nsISmsRequest.NO_SIGNAL_ERROR;
+        error = Ci.nsIMobileMessageCallback.NO_SIGNAL_ERROR;
         break;
     }
 

dom/system/gonk/nsIRadioInterfaceLayer.idl

@@ -6,7 +6,7 @@
 
 interface nsIDOMMozMobileConnectionInfo;
 interface nsIDOMMozMobileICCInfo;
-interface nsISmsRequest;
+interface nsIMobileMessageCallback;
 interface nsIDOMMozSmsSegmentInfo;
 
 [scriptable, uuid(1e602d20-d066-4399-8997-daf36b3158ef)]
@@ -108,7 +108,7 @@ interface nsIRilContext : nsISupports
   readonly attribute nsIDOMMozMobileConnectionInfo data;
 };
 
-[scriptable, uuid(e5f8cfa9-fd23-4c8d-b06b-635fdbae8b90)]
+[scriptable, uuid(8b3a1bc8-86d2-11e2-ace0-33f0ed290b90)]
 interface nsIRadioInterfaceLayer : nsISupports
 {
   /**
@@ -148,7 +148,7 @@ interface nsIRadioInterfaceLayer : nsISupports
 
   void sendSMS(in DOMString number,
                in DOMString message,
-               in nsISmsRequest request);
+               in nsIMobileMessageCallback request);
 
   /**
    * ICC-related functionality.

js/xpconnect/src/dictionary_helper_gen.conf

@@ -20,7 +20,7 @@ dictionaries = [
      [ 'CameraSelector', 'nsIDOMCameraManager.idl' ],
      [ 'CameraPictureOptions', 'nsIDOMCameraManager.idl' ],
      [ 'CameraRecordingOptions', 'nsIDOMCameraManager.idl' ],
-     [ 'SmsThreadListItem', 'nsISmsRequest.idl' ],
+     [ 'SmsThreadListItem', 'nsIMobileMessageCallback.idl' ],
      [ 'MmsAttachment', 'nsIDOMMozMmsMessage.idl' ]
    ]
 

widget/android/AndroidBridge.cpp

@@ -60,7 +60,7 @@ class AndroidRefable {
 // This isn't in AndroidBridge.h because including StrongPointer.h there is gross
 static android::sp<AndroidRefable> (*android_SurfaceTexture_getNativeWindow)(JNIEnv* env, jobject surfaceTexture) = nullptr;
 
-/* static */ StaticAutoPtr<nsTArray<nsCOMPtr<nsISmsRequest> > > AndroidBridge::sSmsRequests;
+/* static */ StaticAutoPtr<nsTArray<nsCOMPtr<nsIMobileMessageCallback> > > AndroidBridge::sSmsRequests;
 
 void
 AndroidBridge::ConstructBridge(JNIEnv *jEnv,
@@ -1670,7 +1670,9 @@ AndroidBridge::GetSegmentInfoForText(const nsAString& aText,
 }
 
 void
-AndroidBridge::SendMessage(const nsAString& aNumber, const nsAString& aMessage, nsISmsRequest* aRequest)
+AndroidBridge::SendMessage(const nsAString& aNumber,
+                           const nsAString& aMessage,
+                           nsIMobileMessageCallback* aRequest)
 {
     ALOG_BRIDGE("AndroidBridge::SendMessage");
 
@@ -1690,7 +1692,7 @@ AndroidBridge::SendMessage(const nsAString& aNumber, const nsAString& aMessage,
 }
 
 void
-AndroidBridge::GetMessage(int32_t aMessageId, nsISmsRequest* aRequest)
+AndroidBridge::GetMessage(int32_t aMessageId, nsIMobileMessageCallback* aRequest)
 {
     ALOG_BRIDGE("AndroidBridge::GetMessage");
 
@@ -1707,7 +1709,7 @@ AndroidBridge::GetMessage(int32_t aMessageId, nsISmsRequest* aRequest)
 }
 
 void
-AndroidBridge::DeleteMessage(int32_t aMessageId, nsISmsRequest* aRequest)
+AndroidBridge::DeleteMessage(int32_t aMessageId, nsIMobileMessageCallback* aRequest)
 {
     ALOG_BRIDGE("AndroidBridge::DeleteMessage");
 
@@ -1725,7 +1727,7 @@ AndroidBridge::DeleteMessage(int32_t aMessageId, nsISmsRequest* aRequest)
 
 void
 AndroidBridge::CreateMessageList(const dom::mobilemessage::SmsFilterData& aFilter, bool aReverse,
-                                 nsISmsRequest* aRequest)
+                                 nsIMobileMessageCallback* aRequest)
 {
     ALOG_BRIDGE("AndroidBridge::CreateMessageList");
 
@@ -1756,7 +1758,7 @@ AndroidBridge::CreateMessageList(const dom::mobilemessage::SmsFilterData& aFilte
 }
 
 void
-AndroidBridge::GetNextMessageInList(int32_t aListId, nsISmsRequest* aRequest)
+AndroidBridge::GetNextMessageInList(int32_t aListId, nsIMobileMessageCallback* aRequest)
 {
     ALOG_BRIDGE("AndroidBridge::GetNextMessageInList");
 
@@ -1786,7 +1788,7 @@ AndroidBridge::ClearMessageList(int32_t aListId)
 }
 
 bool
-AndroidBridge::QueueSmsRequest(nsISmsRequest* aRequest, uint32_t* aRequestIdOut)
+AndroidBridge::QueueSmsRequest(nsIMobileMessageCallback* aRequest, uint32_t* aRequestIdOut)
 {
     MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
     MOZ_ASSERT(aRequest && aRequestIdOut);
@@ -1812,7 +1814,7 @@ AndroidBridge::QueueSmsRequest(nsISmsRequest* aRequest, uint32_t* aRequestIdOut)
     return true;
 }
 
-already_AddRefed<nsISmsRequest>
+already_AddRefed<nsIMobileMessageCallback>
 AndroidBridge::DequeueSmsRequest(uint32_t aRequestId)
 {
     MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");

widget/android/AndroidBridge.h

@@ -25,7 +25,7 @@
 #include "gfxRect.h"
 
 #include "nsIAndroidBridge.h"
-#include "nsISmsRequest.h"
+#include "nsIMobileMessageCallback.h"
 
 #include "mozilla/Likely.h"
 #include "mozilla/StaticPtr.h"
@@ -314,14 +314,17 @@ public:
     void DisableBatteryNotifications();
     void GetCurrentBatteryInformation(hal::BatteryInformation* aBatteryInfo);
 
-    nsresult GetSegmentInfoForText(const nsAString& aText, dom::mobilemessage::SmsSegmentInfoData* aData);
+    nsresult GetSegmentInfoForText(const nsAString& aText,
-    void SendMessage(const nsAString& aNumber, const nsAString& aText, nsISmsRequest* aRequest);
+                                   dom::mobilemessage::SmsSegmentInfoData* aData);
-    void GetMessage(int32_t aMessageId, nsISmsRequest* aRequest);
+    void SendMessage(const nsAString& aNumber, const nsAString& aText,
-    void DeleteMessage(int32_t aMessageId, nsISmsRequest* aRequest);
+                     nsIMobileMessageCallback* aRequest);
-    void CreateMessageList(const dom::mobilemessage::SmsFilterData& aFilter, bool aReverse, nsISmsRequest* aRequest);
+    void GetMessage(int32_t aMessageId, nsIMobileMessageCallback* aRequest);
-    void GetNextMessageInList(int32_t aListId, nsISmsRequest* aRequest);
+    void DeleteMessage(int32_t aMessageId, nsIMobileMessageCallback* aRequest);
+    void CreateMessageList(const dom::mobilemessage::SmsFilterData& aFilter,
+                           bool aReverse, nsIMobileMessageCallback* aRequest);
+    void GetNextMessageInList(int32_t aListId, nsIMobileMessageCallback* aRequest);
     void ClearMessageList(int32_t aListId);
-    already_AddRefed<nsISmsRequest> DequeueSmsRequest(uint32_t aRequestId);
+    already_AddRefed<nsIMobileMessageCallback> DequeueSmsRequest(uint32_t aRequestId);
 
     bool IsTablet();
 
@@ -367,7 +370,7 @@ public:
                             nsACString & aResult);
 protected:
     static AndroidBridge *sBridge;
-    static StaticAutoPtr<nsTArray<nsCOMPtr<nsISmsRequest> > > sSmsRequests;
+    static StaticAutoPtr<nsTArray<nsCOMPtr<nsIMobileMessageCallback> > > sSmsRequests;
 
     // the global JavaVM
     JavaVM *mJavaVM;
@@ -398,7 +401,7 @@ protected:
 
     int mAPIVersion;
 
-    bool QueueSmsRequest(nsISmsRequest* aRequest, uint32_t* aRequestIdOut);
+    bool QueueSmsRequest(nsIMobileMessageCallback* aRequest, uint32_t* aRequestIdOut);
 
     // other things
     jmethodID jNotifyIME;

widget/android/AndroidJNI.cpp

@@ -245,7 +245,7 @@ Java_org_mozilla_gecko_GeckoSmsManager_notifySmsSent(JNIEnv* jenv, jclass,
         nsCOMPtr<nsIDOMMozSmsMessage> message = new SmsMessage(mMessageData);
         obs->NotifyObservers(message, kSmsSentObserverTopic, nullptr);
 
-        nsCOMPtr<nsISmsRequest> request =
+        nsCOMPtr<nsIMobileMessageCallback> request =
           AndroidBridge::Bridge()->DequeueSmsRequest(mRequestId);
         NS_ENSURE_TRUE(request, NS_ERROR_FAILURE);
 
@@ -326,7 +326,7 @@ Java_org_mozilla_gecko_GeckoSmsManager_notifySmsSendFailed(JNIEnv* jenv, jclass,
       {}
 
       NS_IMETHODIMP Run() {
-        nsCOMPtr<nsISmsRequest> request =
+        nsCOMPtr<nsIMobileMessageCallback> request =
           AndroidBridge::Bridge()->DequeueSmsRequest(mRequestId);
         NS_ENSURE_TRUE(request, NS_ERROR_FAILURE);
 
@@ -364,7 +364,7 @@ Java_org_mozilla_gecko_GeckoSmsManager_notifyGetSms(JNIEnv* jenv, jclass,
       {}
 
       NS_IMETHODIMP Run() {
-        nsCOMPtr<nsISmsRequest> request =
+        nsCOMPtr<nsIMobileMessageCallback> request =
           AndroidBridge::Bridge()->DequeueSmsRequest(mRequestId);
         NS_ENSURE_TRUE(request, NS_ERROR_FAILURE);
 
@@ -408,7 +408,7 @@ Java_org_mozilla_gecko_GeckoSmsManager_notifyGetSmsFailed(JNIEnv* jenv, jclass,
       {}
 
       NS_IMETHODIMP Run() {
-        nsCOMPtr<nsISmsRequest> request =
+        nsCOMPtr<nsIMobileMessageCallback> request =
           AndroidBridge::Bridge()->DequeueSmsRequest(mRequestId);
         NS_ENSURE_TRUE(request, NS_ERROR_FAILURE);
 
@@ -440,7 +440,7 @@ Java_org_mozilla_gecko_GeckoSmsManager_notifySmsDeleted(JNIEnv* jenv, jclass,
       {}
 
       NS_IMETHODIMP Run() {
-        nsCOMPtr<nsISmsRequest> request =
+        nsCOMPtr<nsIMobileMessageCallback> request =
           AndroidBridge::Bridge()->DequeueSmsRequest(mRequestId);
         NS_ENSURE_TRUE(request, NS_ERROR_FAILURE);
 
@@ -473,7 +473,7 @@ Java_org_mozilla_gecko_GeckoSmsManager_notifySmsDeleteFailed(JNIEnv* jenv, jclas
       {}
 
       NS_IMETHODIMP Run() {
-        nsCOMPtr<nsISmsRequest> request =
+        nsCOMPtr<nsIMobileMessageCallback> request =
           AndroidBridge::Bridge()->DequeueSmsRequest(mRequestId);
         NS_ENSURE_TRUE(request, NS_ERROR_FAILURE);
 
@@ -503,7 +503,7 @@ Java_org_mozilla_gecko_GeckoSmsManager_notifyNoMessageInList(JNIEnv* jenv, jclas
       {}
 
       NS_IMETHODIMP Run() {
-        nsCOMPtr<nsISmsRequest> request =
+        nsCOMPtr<nsIMobileMessageCallback> request =
           AndroidBridge::Bridge()->DequeueSmsRequest(mRequestId);
         NS_ENSURE_TRUE(request, NS_ERROR_FAILURE);
 
@@ -543,7 +543,7 @@ Java_org_mozilla_gecko_GeckoSmsManager_notifyListCreated(JNIEnv* jenv, jclass,
       {}
 
       NS_IMETHODIMP Run() {
-        nsCOMPtr<nsISmsRequest> request =
+        nsCOMPtr<nsIMobileMessageCallback> request =
           AndroidBridge::Bridge()->DequeueSmsRequest(mRequestId);
         NS_ENSURE_TRUE(request, NS_ERROR_FAILURE);
 
@@ -595,7 +595,7 @@ Java_org_mozilla_gecko_GeckoSmsManager_notifyGotNextMessage(JNIEnv* jenv, jclass
       {}
 
       NS_IMETHODIMP Run() {
-        nsCOMPtr<nsISmsRequest> request =
+        nsCOMPtr<nsIMobileMessageCallback> request =
           AndroidBridge::Bridge()->DequeueSmsRequest(mRequestId);
         NS_ENSURE_TRUE(request, NS_ERROR_FAILURE);
 
@@ -641,7 +641,7 @@ Java_org_mozilla_gecko_GeckoSmsManager_notifyReadingMessageListFailed(JNIEnv* je
       {}
 
       NS_IMETHODIMP Run() {
-        nsCOMPtr<nsISmsRequest> request =
+        nsCOMPtr<nsIMobileMessageCallback> request =
           AndroidBridge::Bridge()->DequeueSmsRequest(mRequestId);
         NS_ENSURE_TRUE(request, NS_ERROR_FAILURE);