]> sjero.net Git - linphone/commitdiff
Fix JNI compil
authorSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Fri, 14 Sep 2012 14:20:02 +0000 (16:20 +0200)
committerSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Fri, 14 Sep 2012 14:20:02 +0000 (16:20 +0200)
coreapi/linphonecore_jni.cc

index 224c26503a0b80398b00ac7422ce7765bef60512..440afcbc6df96d05f700e46de3ff878e4a023442 100644 (file)
@@ -152,6 +152,7 @@ public:
 
                /*void textReceived(LinphoneCore lc, LinphoneChatRoom cr,LinphoneAddress from,String message);*/
                textReceivedId = env->GetMethodID(listenerClass,"textReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;Lorg/linphone/core/LinphoneAddress;Ljava/lang/String;)V");
+               messageReceivedId = env->GetMethodID(listenerClass,"messageReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;Lorg/linphone/core/LinphoneAddress;Lorg/linphone/core/LinphoneChatMessage;)V");
 
                proxyClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneProxyConfigImpl"));
                proxyCtrId = env->GetMethodID(proxyClass,"<init>", "(J)V");
@@ -389,7 +390,7 @@ public:
                                                        ,env->NewObject(lcData->addressClass,lcData->addressCtrId,(jlong)from)
                                                        ,message ? env->NewStringUTF(message) : NULL);
        }
-       static void message_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from, const LinphoneChatMessage *msg) {
+       static void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *msg) {
                        JNIEnv *env = 0;
                        jint result = jvm->AttachCurrentThread(&env,NULL);
                        if (result != 0) {
@@ -401,7 +402,7 @@ public:
                                                                ,lcData->messageReceivedId
                                                                ,lcData->core
                                                                ,env->NewObject(lcData->chatRoomClass,lcData->chatRoomCtrId,(jlong)room)
-                                                               ,env->NewObject(lcData->addressClass,lcData->addressCtrId,(jlong)from)
+                                                               ,env->NewObject(lcData->addressClass,lcData->addressCtrId,(jlong)msg->from)
                                                                ,env->NewObject(lcData->chatMessageClass,lcData->chatMessageCtrId,(jlong)msg));
                }
        static void ecCalibrationStatus(LinphoneCore *lc, LinphoneEcCalibratorStatus status, int delay_ms, void *data) {