backward compat fixes

diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
index 58a75e56be2b6a408db286f444313860dcaccddf..1d86d482bd64b0dbd94ce945e1aed204109f44ef 100644 (file)
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
@@ -20,6 +20,7 @@ package org.linphone.core.tutorials;
 
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneChatMessage;
 import org.linphone.core.LinphoneChatRoom;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
@@ -231,5 +232,11 @@ public class TutorialBuddyStatus implements LinphoneCoreListener {
                TutorialNotifier.notify(s);
        }
 
+       @Override
+       public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message) {
+               // TODO Auto-generated method stub
+               
+       }
+
 
 }

diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
index c81823e8a66b0bdb3a8d01e746f40882c7a9f701..91dc0f247ff5fe6f727ab03b87f9082c329e02d6 100644 (file)
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
@@ -20,6 +20,7 @@ package org.linphone.core.tutorials;
 
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneChatMessage;
 import org.linphone.core.LinphoneChatRoom;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
@@ -146,5 +147,12 @@ public class TutorialChatRoom implements LinphoneCoreListener {
                TutorialNotifier.notify(s);
        }
 
+       @Override
+       public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr,
+                       LinphoneChatMessage message) {
+               // TODO Auto-generated method stub
+               
+       }
+
 
 }

diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
index 6daa65711f0f2e8c96aaac375f1b64ded179df0c..354f9750157ca6bca611fc30bb564ff96935690c 100644 (file)
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
@@ -20,6 +20,7 @@ package org.linphone.core.tutorials;
 
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneChatMessage;
 import org.linphone.core.LinphoneChatRoom;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
@@ -156,5 +157,12 @@ public class TutorialHelloWorld implements LinphoneCoreListener {
                TutorialNotifier.notify(s);
        }
 
+       @Override
+       public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr,
+                       LinphoneChatMessage message) {
+               // TODO Auto-generated method stub
+               
+       }
+
 
 }

diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
index 674044471ce76e1f9b1af867586aedb28e6835b7..48e473d61fe58a1918b9c92285b605fca2408f63 100644 (file)
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
@@ -20,6 +20,7 @@ package org.linphone.core.tutorials;
 
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
+import org.linphone.core.LinphoneChatMessage;
 import org.linphone.core.LinphoneChatRoom;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
@@ -187,6 +188,13 @@ public class TutorialRegistration implements LinphoneCoreListener {
                TutorialNotifier.notify(s);
        }
 
+       @Override
+       public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr,
+                       LinphoneChatMessage message) {
+               // TODO Auto-generated method stub
+               
+       }
+
 
 
 }

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 440afcbc6df96d05f700e46de3ff878e4a023442..eacb220e00b48eddae660454e2e201e95825f49b 100644 (file)
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -152,7 +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");
+               messageReceivedId = env->GetMethodID(listenerClass,"messageReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;Lorg/linphone/core/LinphoneChatMessage;)V");
 
                proxyClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneProxyConfigImpl"));
                proxyCtrId = env->GetMethodID(proxyClass,"<init>", "(J)V");
@@ -161,7 +161,7 @@ public:
                callCtrId = env->GetMethodID(callClass,"<init>", "(J)V");
 
                chatMessageClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessageImpl"));
-               chatMessageCtrId = env->GetMethodID(chatMessageClass,"<init>", "(J)V");
+               if (chatMessageClass) chatMessageCtrId = env->GetMethodID(chatMessageClass,"<init>", "(J)V");
 
                chatRoomClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatRoomImpl"));
                chatRoomCtrId = env->GetMethodID(chatRoomClass,"<init>", "(J)V");
@@ -402,7 +402,6 @@ public:
                                                                ,lcData->messageReceivedId
                                                                ,lcData->core
                                                                ,env->NewObject(lcData->chatRoomClass,lcData->chatRoomCtrId,(jlong)room)
-                                                               ,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) {

diff --git a/java/common/org/linphone/core/LinphoneChatRoom.java b/java/common/org/linphone/core/LinphoneChatRoom.java
index 102a03c217a1ad0e9453adcd8fc6661641900119..d6512f1707258e004e846cbea9dee97a646fad9f 100644 (file)
--- a/java/common/org/linphone/core/LinphoneChatRoom.java
+++ b/java/common/org/linphone/core/LinphoneChatRoom.java
@@ -40,12 +40,6 @@ public interface LinphoneChatRoom {
         * @param chat message
         */
        void sendMessage(LinphoneChatMessage message, LinphoneChatMessage.StateListener listener);
-       /**
-        * DEPRECATED
-        * @param opaque
-        * @param message
-        */
-       void sendMessage(Object opaque, String message);
        
        /**
         * Create a LinphoneChatMessage

diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index ce476c738668dee41231a4097e086f1258e0873f..6ac821322d8593bc23e1d21602a4498445448a7d 100644 (file)
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -491,11 +491,17 @@ public interface LinphoneCore {
         */
        void clearCallLogs();
        /***
-        * get payload type  from mime type an clock rate
+        * get payload type  from mime type, clock rate, and number of channels.-
         * 
         * return null if not found
         */
        PayloadType findPayloadType(String mime, int clockRate, int channels); 
+       /***
+        * get payload type  from mime type and clock rate..
+        * 
+        * return null if not found
+        */
+       PayloadType findPayloadType(String mime, int clockRate); 
        /**
         * not implemented yet
         * @param pt

diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java
index 150141ffe7bf00927a65200845cb1f0805976dab..a84f736d2c164099a546d4febb793689aff98420 100644 (file)
--- a/java/common/org/linphone/core/LinphoneCoreListener.java
+++ b/java/common/org/linphone/core/LinphoneCoreListener.java
@@ -82,10 +82,9 @@ public interface LinphoneCoreListener {
         * invoked when a new linphone chat message is received
         * @param lc LinphoneCore
         * @param  room         LinphoneChatRoom involved in this conversation. Can be be created by the framework in case the from is not present in any chat room.
-        * @param from          LinphoneAddress from
         * @param message       incoming linphone chat message message
         */
-       void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneAddress from, LinphoneChatMessage message);
+       void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message);
 
        /**
         * Invoked when echo cancalation calibration is completed