From: Sylvain Berfini Date: Wed, 12 Sep 2012 14:56:12 +0000 (+0200) Subject: GetPeerAdress added to LinphoneChatMessage X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=d74083cfaa2d757ab16588490c1844b090687f18 GetPeerAdress added to LinphoneChatMessage --- diff --git a/coreapi/chat.c b/coreapi/chat.c index 72cb42ce..cc36d730 100644 --- a/coreapi/chat.c +++ b/coreapi/chat.c @@ -170,6 +170,10 @@ char* linphone_chat_message_get_message(LinphoneChatMessage* msg) { return msg->message; } +const LinphoneAddress* linphone_chat_message_get_peer_address(LinphoneChatMessage *msg) { + return linphone_chat_room_get_peer_address(msg->chat_room); +} + /** * user pointer set function */ diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 0fb87e9c..d4a0355b 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -672,6 +672,7 @@ void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage* 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); +const LinphoneAddress* linphone_chat_message_get_peer_address(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 57fd81e9..4d95af69 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -1387,6 +1387,11 @@ extern "C" jstring Java_org_linphone_core_LinphoneChatMessageImpl_getMessage(JNI jstring jvalue =env->NewStringUTF(linphone_chat_message_get_message((LinphoneChatMessage*)ptr)); return jvalue; } +extern "C" long Java_org_linphone_core_LinphoneChatMessageImpl_getPeerAddress(JNIEnv* env + ,jobject thiz + ,jlong ptr) { + return (long) linphone_chat_message_get_peer_address((LinphoneChatMessage*)ptr); +} 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 31f8c122..726a8690 100644 --- a/java/common/org/linphone/core/LinphoneChatMessage.java +++ b/java/common/org/linphone/core/LinphoneChatMessage.java @@ -60,5 +60,17 @@ public interface LinphoneChatMessage { void setUserData(); + /** + * get text associated to this LinphoneChatMessage + * + * @return text sent along with the message + */ String getMessage(); + + /** + * get peer address associated to this LinphoneChatMessage + * + * @return LinphoneAddress peer address + */ + LinphoneAddress getPeerAddress(); }