mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-27 13:16:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent creation of a new LinphoneChatMessage on each JNI callback

Browse source
This commit is contained in:
Sylvain Berfini 2014-09-11 12:56:46 +02:00
parent e9a376a014
commit 94e9cc391b
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
coreapi/linphonecore_jni.cc
View file

@ -623,8 +623,25 @@ public:
,env->NewObject(lcData->addressClass,lcData->addressCtrId,(jlong)from) ,env->NewObject(lcData->addressClass,lcData->addressCtrId,(jlong)from)
,message ? env->NewStringUTF(message) : NULL); ,message ? env->NewStringUTF(message) : NULL);
} }
jobject getChatMessage(JNIEnv *env , LinphoneChatMessage *msg){
jobject jobj = 0;
if (msg != NULL){
void *up = linphone_chat_message_get_user_data(msg);
if (up == NULL) {
jobj = env->NewObject(chatMessageClass,chatMessageCtrId,(jlong)linphone_chat_message_ref(msg));
jobj = env->NewGlobalRef(jobj);
linphone_chat_message_set_user_data(msg,(void*)jobj);
} else {
jobj = (jobject)up;
}
}
return jobj;
}
static void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *msg) { static void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *msg) {
JNIEnv *env = 0; JNIEnv *env = 0;
jobject jmsg;
jint result = jvm->AttachCurrentThread(&env,NULL); jint result = jvm->AttachCurrentThread(&env,NULL);
if (result != 0) { if (result != 0) {
ms_error("cannot attach VM"); ms_error("cannot attach VM");
@ -636,7 +653,7 @@ public:
,lcData->messageReceivedId ,lcData->messageReceivedId
,lcData->core ,lcData->core
,env->NewObject(lcData->chatRoomClass,lcData->chatRoomCtrId,(jlong)room) ,env->NewObject(lcData->chatRoomClass,lcData->chatRoomCtrId,(jlong)room)
,env->NewObject(lcData->chatMessageClass,lcData->chatMessageCtrId,(jlong)linphone_chat_message_ref(msg))); ,(jmsg = lcData->getChatMessage(env, msg)));
} }
static void is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room) { static void is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room) {
JNIEnv *env = 0; JNIEnv *env = 0;
@ -807,6 +824,7 @@ public:
static void fileTransferProgressIndication(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, size_t progress) { static void fileTransferProgressIndication(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, size_t progress) {
JNIEnv *env = 0; JNIEnv *env = 0;
jobject jmsg;
jint result = jvm->AttachCurrentThread(&env,NULL); jint result = jvm->AttachCurrentThread(&env,NULL);
if (result != 0) { if (result != 0) {
ms_error("cannot attach VM"); ms_error("cannot attach VM");
@ -816,13 +834,14 @@ public:
env->CallVoidMethod(lcData->listener, env->CallVoidMethod(lcData->listener,
lcData->fileTransferProgressIndicationId, lcData->fileTransferProgressIndicationId,
lcData->core, lcData->core,
message ? env->NewObject(lcData->chatMessageClass, lcData->chatMessageCtrId, (jlong)message) : NULL, (jmsg = lcData->getChatMessage(env, message)),
content ? create_java_linphone_content(env, content) : NULL, content ? create_java_linphone_content(env, content) : NULL,
progress); progress);
} }
static void fileTransferSend(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, char* buff, size_t* size) { static void fileTransferSend(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, char* buff, size_t* size) {
JNIEnv *env = 0; JNIEnv *env = 0;
jobject jmsg;
size_t asking = *size; size_t asking = *size;
jint result = jvm->AttachCurrentThread(&env,NULL); jint result = jvm->AttachCurrentThread(&env,NULL);
if (result != 0) { if (result != 0) {
@ -833,7 +852,7 @@ public:
*size = env->CallIntMethod(lcData->listener, *size = env->CallIntMethod(lcData->listener,
lcData->fileTransferSendId, lcData->fileTransferSendId,
lcData->core, lcData->core,
message ? env->NewObject(lcData->chatMessageClass, lcData->chatMessageCtrId, (jlong)message) : NULL, (jmsg = lcData->getChatMessage(env, message)),
content ? create_java_linphone_content(env, content) : NULL, content ? create_java_linphone_content(env, content) : NULL,
buff ? env->NewDirectByteBuffer(buff, asking) : NULL, buff ? env->NewDirectByteBuffer(buff, asking) : NULL,
asking); asking);
@ -841,6 +860,7 @@ public:
static void fileTransferRecv(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size) { static void fileTransferRecv(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size) {
JNIEnv *env = 0; JNIEnv *env = 0;
jobject jmsg;
jint result = jvm->AttachCurrentThread(&env,NULL); jint result = jvm->AttachCurrentThread(&env,NULL);
if (result != 0) { if (result != 0) {
ms_error("cannot attach VM"); ms_error("cannot attach VM");
@ -854,7 +874,7 @@ public:
env->CallVoidMethod(lcData->listener, env->CallVoidMethod(lcData->listener,
lcData->fileTransferRecvId, lcData->fileTransferRecvId,
lcData->core, lcData->core,
message ? env->NewObject(lcData->chatMessageClass, lcData->chatMessageCtrId, (jlong)message) : NULL, (jmsg = lcData->getChatMessage(env, message)),
content ? create_java_linphone_content(env, content) : NULL, content ? create_java_linphone_content(env, content) : NULL,
jbytes, jbytes,
size); size);