corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gene Lian
2013-03-09 15:22:02 +08:00
parent 3a8a9f5edf
commit 218b706270
26 changed files with 168 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
widget/android/AndroidBridge.cpp
View File

@@ -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!");