From: Sylvain Berfini Date: Wed, 12 Sep 2012 14:45:59 +0000 (+0200) Subject: GetMessage method for linphoneChatMessage X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=328c83b51c47cde5f4fec74e2556194097ed22d4 GetMessage method for linphoneChatMessage --- diff --git a/coreapi/chat.c b/coreapi/chat.c index ddc3f5bf..72cb42ce 100644 --- a/coreapi/chat.c +++ b/coreapi/chat.c @@ -165,6 +165,11 @@ const char* linphone_chat_message_state_to_string(const LinphoneChatMessageState } } + +char* linphone_chat_message_get_message(LinphoneChatMessage* msg) { + return msg->message; +} + /** * user pointer set function */ diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index da55604d..0fb87e9c 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -671,6 +671,7 @@ typedef void (*LinphoneChatMessageStateChangeCb)(LinphoneChatMessage* msg,Linpho void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage* msg,LinphoneChatMessageStateChangeCb status_cb,void* ud); LinphoneCore* linphone_chat_room_get_lc(LinphoneChatRoom *cr); LinphoneChatRoom* linphone_chat_message_get_chat_room(LinphoneChatMessage *msg); +char* linphone_chat_message_get_message(LinphoneChatMessage *msg); void linphone_chat_room_set_user_data(LinphoneChatRoom *cr, void * ud); void * linphone_chat_room_get_user_data(LinphoneChatRoom *cr); diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 9d30dc33..57fd81e9 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -1377,11 +1377,16 @@ extern "C" jlong Java_org_linphone_core_LinphoneChatRoomImpl_createLinphoneChatM } extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_setUserData(JNIEnv* env ,jobject thiz - ,jlong ptr - ) { + ,jlong ptr) { jobject ud = env->NewGlobalRef(thiz); linphone_chat_message_set_user_data((LinphoneChatMessage*)ptr,(void*) ud); } +extern "C" jstring Java_org_linphone_core_LinphoneChatMessageImpl_getMessage(JNIEnv* env + ,jobject thiz + ,jlong ptr) { + jstring jvalue =env->NewStringUTF(linphone_chat_message_get_message((LinphoneChatMessage*)ptr)); + return jvalue; +} extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_sendMessage(JNIEnv* env ,jobject thiz ,jlong ptr diff --git a/java/common/org/linphone/core/LinphoneChatMessage.java b/java/common/org/linphone/core/LinphoneChatMessage.java index 5e107619..31f8c122 100644 --- a/java/common/org/linphone/core/LinphoneChatMessage.java +++ b/java/common/org/linphone/core/LinphoneChatMessage.java @@ -59,4 +59,6 @@ public interface LinphoneChatMessage { Object getUserData(); void setUserData(); + + String getMessage(); }