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 858689 - Sending an SMS fails on Android. r=mounir

Browse Source
This commit is contained in:
Brad Lassey 2013-04-08 10:29:34 -04:00
parent ef248673de
commit e770db2c0b
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
widget/android/AndroidBridge.cpp
View File

@ -58,8 +58,6 @@ 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<nsIMobileMessageCallback> > > AndroidBridge::sSmsRequests;
void
AndroidBridge::ConstructBridge(JNIEnv *jEnv,
jclass jGeckoAppShellClass)
@ -1773,21 +1771,16 @@ AndroidBridge::QueueSmsRequest(nsIMobileMessageCallback* aRequest, uint32_t* aRe
MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
MOZ_ASSERT(aRequest && aRequestIdOut);
if (!sSmsRequests) {
// Probably shutting down.
return false;
}
const uint32_t length = sSmsRequests->Length();
const uint32_t length = mSmsRequests.Length();
for (uint32_t i = 0; i < length; i++) {
if (!(*sSmsRequests)[i]) {
(*sSmsRequests)[i] = aRequest;
if (!(mSmsRequests)[i]) {
(mSmsRequests)[i] = aRequest;
*aRequestIdOut = i;
return true;
}
}
sSmsRequests->AppendElement(aRequest);
mSmsRequests.AppendElement(aRequest);
// After AppendElement(), previous `length` points to the new tail element.
*aRequestIdOut = length;
@ -1799,17 +1792,12 @@ AndroidBridge::DequeueSmsRequest(uint32_t aRequestId)
{
MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
if (!sSmsRequests) {
// Probably shutting down.
MOZ_ASSERT(aRequestId < mSmsRequests.Length());
if (aRequestId >= mSmsRequests.Length()) {
return nullptr;
}
MOZ_ASSERT(aRequestId < sSmsRequests->Length());
if (aRequestId >= sSmsRequests->Length()) {
return nullptr;
}
return (*sSmsRequests)[aRequestId].forget();
return mSmsRequests[aRequestId].forget();
}
void

2
widget/android/AndroidBridge.h
View File

@ -367,7 +367,7 @@ public:
nsACString & aResult);
protected:
static AndroidBridge *sBridge;
static StaticAutoPtr<nsTArray<nsCOMPtr<nsIMobileMessageCallback> > > sSmsRequests;
nsTArray<nsCOMPtr<nsIMobileMessageCallback> > mSmsRequests;
// the global JavaVM
JavaVM *mJavaVM;