From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 11 Apr 2013 12:34:49 +0000 (+0200)
Subject: Merge branch 'master' of git://git.linphone.org/linphone
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=0dadf758c3bcd5ca26011cc2eee63a9abaa3e7fc;hp=0fa5d7c73b672772a8841c65ff0c7fcdc4e1fce7

Merge branch 'master' of git://git.linphone.org/linphone
---

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index ddc26f65..5046d83b 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1871,6 +1871,12 @@ extern "C" jlong Java_org_linphone_core_LinphoneChatMessageImpl_getPeerAddress(J
 	return (jlong) linphone_chat_message_get_peer_address((LinphoneChatMessage*)ptr);
 }
 
+extern "C" jlong Java_org_linphone_core_LinphoneChatMessageImpl_getTime(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	return (jlong) linphone_chat_message_get_time((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 3a2a4571..b6b6c30e 100644
--- a/java/common/org/linphone/core/LinphoneChatMessage.java
+++ b/java/common/org/linphone/core/LinphoneChatMessage.java
@@ -106,4 +106,10 @@ public interface LinphoneChatMessage {
 	 * @return the value of the header, or null if not found.
 	 */
 	String  getCustomHeader(String name);
+	
+	/**
+	 * Gets the time at which the message was sent
+	 * @return the time in milliseconds
+	 */
+	long getTime();
 }
diff --git a/java/impl/org/linphone/core/LinphoneChatMessageImpl.java b/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
index 1373708c..2a256f2f 100644
--- a/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
+++ b/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
@@ -8,6 +8,7 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
 	private native String getExternalBodyUrl(long ptr);
 	private native void setExternalBodyUrl(long ptr, String url);
 	private native long getFrom(long ptr);
+	private native long getTime(long ptr);
 	
 	protected LinphoneChatMessageImpl(long aNativePtr)  {
 		nativePtr = aNativePtr;
@@ -64,4 +65,8 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
 	public String getCustomHeader(String name) {
 		return getCustomHeader(nativePtr,name);
 	}
+	
+	public long getTime() {
+		return getTime(nativePtr);
+	}
 }