From c828b54b330076fd020612c56c9be65ba44318fc Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 14 Nov 2014 18:58:51 +0100 Subject: [PATCH] fix errors in the file transfer API design that were also wrapped in java. --- coreapi/linphonecore_jni.cc | 4 ++-- java/common/org/linphone/core/LinphoneChatMessage.java | 5 +++++ java/common/org/linphone/core/LinphoneChatRoom.java | 5 ----- java/impl/org/linphone/core/LinphoneChatMessageImpl.java | 6 ++++++ java/impl/org/linphone/core/LinphoneChatRoomImpl.java | 7 ------- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index ffc9e913d..2a985519e 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -2685,8 +2685,8 @@ extern "C" jlong Java_org_linphone_core_LinphoneChatRoomImpl_createFileTransferM return (jlong) message; } -extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_cancelFileTransfer(JNIEnv* env, jobject thiz, jlong ptr, jlong message) { - linphone_chat_room_cancel_file_transfer((LinphoneChatMessage *)message); +extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_cancelFileTransfer(JNIEnv* env, jobject thiz, jlong ptr) { + linphone_chat_message_cancel_file_transfer((LinphoneChatMessage *)ptr); } extern "C" jobject Java_org_linphone_core_LinphoneChatMessageImpl_getFileTransferInformation(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 930a064db..b1b839b5e 100644 --- a/java/common/org/linphone/core/LinphoneChatMessage.java +++ b/java/common/org/linphone/core/LinphoneChatMessage.java @@ -163,6 +163,10 @@ public interface LinphoneChatMessage { */ void startFileDownload(LinphoneChatMessage.StateListener listener); + /** + * Cancel an ongoing file transfer attached to this message.(upload or download). + */ + void cancelFileTransfer(); /** * Get the file_transfer_information (used by call backs to recover informations during a rcs file transfer) * @return a pointer to the LinphoneContent structure or NULL if not present. @@ -179,4 +183,5 @@ public interface LinphoneChatMessage { * @return the data stored in the chat message if any, else null */ String getAppData(); + } diff --git a/java/common/org/linphone/core/LinphoneChatRoom.java b/java/common/org/linphone/core/LinphoneChatRoom.java index 1f8c58f8c..b18e79d0c 100644 --- a/java/common/org/linphone/core/LinphoneChatRoom.java +++ b/java/common/org/linphone/core/LinphoneChatRoom.java @@ -144,9 +144,4 @@ public interface LinphoneChatRoom { */ LinphoneChatMessage createFileTransferMessage(LinphoneContent content); - /** - * Cancel an ongoing file transfer attached to this message (upload or download) - * @param message - */ - void cancelFileTransfer(LinphoneChatMessage message); } diff --git a/java/impl/org/linphone/core/LinphoneChatMessageImpl.java b/java/impl/org/linphone/core/LinphoneChatMessageImpl.java index d25ae426a..7e6d474a2 100644 --- a/java/impl/org/linphone/core/LinphoneChatMessageImpl.java +++ b/java/impl/org/linphone/core/LinphoneChatMessageImpl.java @@ -127,4 +127,10 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage { public String getAppData() { return getAppData(nativePtr); } + + private native void cancelFileTransfer(long messagePtr); + @Override + public void cancelFileTransfer() { + cancelFileTransfer(nativePtr); + } } diff --git a/java/impl/org/linphone/core/LinphoneChatRoomImpl.java b/java/impl/org/linphone/core/LinphoneChatRoomImpl.java index d47e4e47e..9236bce03 100644 --- a/java/impl/org/linphone/core/LinphoneChatRoomImpl.java +++ b/java/impl/org/linphone/core/LinphoneChatRoomImpl.java @@ -177,11 +177,4 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom { } } - private native void cancelFileTransfer(long ptr, long messagePtr); - @Override - public void cancelFileTransfer(LinphoneChatMessage message) { - synchronized(getCore()) { - cancelFileTransfer(nativePtr, ((LinphoneChatMessageImpl)message).getNativePtr()); - } - } }