GetPeerAdress added to LinphoneChatMessage

diff --git a/coreapi/chat.c b/coreapi/chat.c
index 72cb42ce5eb2517a99b4d9da0c8d7614cf6e441b..cc36d730566c80c4b2b6835e2804f8c4c4aa43c8 100644 (file)
--- 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 0fb87e9c7faa8829cdfe97520ec449558267937d..d4a0355b683db735e438b3569129644bb39a735a 100644 (file)
--- 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 57fd81e96f17c935eca000d75f72c712cacadd9e..4d95af693d9a3e7a1203ea3a5bbbbc19a43f4b92 100644 (file)
--- 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 31f8c122ae18e93f892bcd0791cb74493851ebc0..726a8690e9b6da2849c6c81d4dadbc6cdcc95b69 100644 (file)
--- 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();
 }