diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index bcaaa3de0..42f9848b2 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -812,9 +812,10 @@ public: env->CallVoidMethod(lcData->listener, lcData->configuringStateId, lcData->core, env->CallStaticObjectMethod(lcData->configuringStateClass,lcData->configuringStateFromIntId,(jint)status), message ? env->NewStringUTF(message) : NULL); } - static void fileTransferProgressIndication(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, size_t progress) { + static void fileTransferProgressIndication(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total) { JNIEnv *env = 0; jobject jmsg; + size_t progress = (offset * 100) / total; jint result = jvm->AttachCurrentThread(&env,NULL); if (result != 0) { ms_error("cannot attach VM"); diff --git a/mediastreamer2 b/mediastreamer2 index edb8e3a17..d051490ff 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit edb8e3a1732e1e94b750d546b21be2c968bca0cc +Subproject commit d051490ff070aece407149baa9a477d97031c1c6