From 3e2f306e361fce90b05da1cfc7d6c16bc592df69 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 12 Aug 2013 09:39:38 +0200 Subject: [PATCH] Added JNI glue for destroy method of LinphoneChatRoom --- coreapi/linphonecore_jni.cc | 6 ++++++ java/common/org/linphone/core/LinphoneChatRoom.java | 5 +++++ java/impl/org/linphone/core/LinphoneChatRoomImpl.java | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index c468db92b..cfac60c85 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -2078,6 +2078,12 @@ extern "C" jlong Java_org_linphone_core_LinphoneChatRoomImpl_createLinphoneChatM return (jlong) chatMessage; } +extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_destroy(JNIEnv* env + ,jobject thiz + ,jlong ptr) { + linphone_chat_room_destroy((LinphoneChatRoom*)ptr); +} + extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_setUserData(JNIEnv* env ,jobject thiz ,jlong ptr) { diff --git a/java/common/org/linphone/core/LinphoneChatRoom.java b/java/common/org/linphone/core/LinphoneChatRoom.java index b6be85a83..9e48d6598 100644 --- a/java/common/org/linphone/core/LinphoneChatRoom.java +++ b/java/common/org/linphone/core/LinphoneChatRoom.java @@ -54,4 +54,9 @@ public interface LinphoneChatRoom { * @return an array of LinphoneChatMessage */ LinphoneChatMessage[] getHistory(); + + /** + * Destroys a LinphoneChatRoom. + */ + void destroy(); } diff --git a/java/impl/org/linphone/core/LinphoneChatRoomImpl.java b/java/impl/org/linphone/core/LinphoneChatRoomImpl.java index e3c96ba60..abe2c52d8 100644 --- a/java/impl/org/linphone/core/LinphoneChatRoomImpl.java +++ b/java/impl/org/linphone/core/LinphoneChatRoomImpl.java @@ -27,6 +27,7 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom { private native void sendMessage(long ptr, String message); private native void sendMessage2(long ptr, long message, StateListener listener); private native long[] getHistory(long ptr); + private native void destroy(long ptr); protected LinphoneChatRoomImpl(long aNativePtr) { nativePtr = aNativePtr; @@ -62,4 +63,8 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom { return messages; } + + public void destroy() { + destroy(nativePtr); + } }