From 048594438ddc7f866eabdd3ecf774cbf629a2f2f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 5 Sep 2012 11:52:18 +0200 Subject: [PATCH] update linphone submodule, add new interface for chat. --- res/raw/linphonerc | 3 ++- src/org/linphone/core/LinphoneChatRoomImpl.java | 12 ++++++++++++ submodules/externals/exosip | 2 +- submodules/linphone | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/res/raw/linphonerc b/res/raw/linphonerc index 0df56c600..a02bb8111 100644 --- a/res/raw/linphonerc +++ b/res/raw/linphonerc @@ -4,6 +4,8 @@ upload_bw=256 firewall_policy=0 mtu=1300 #adaptive_rate_control=1 +#activate_edge_workarounds=1 +#edge_ping_time=200 [sip] sip_port=5060 @@ -18,7 +20,6 @@ default_proxy=0 auto_net_state_mon=0 keepalive_period=30000 auto_answer_replacing_calls=1 -media_encryption=zrtp media_encryption_mandatory=0 [rtp] diff --git a/src/org/linphone/core/LinphoneChatRoomImpl.java b/src/org/linphone/core/LinphoneChatRoomImpl.java index 76874675d..3513f3283 100644 --- a/src/org/linphone/core/LinphoneChatRoomImpl.java +++ b/src/org/linphone/core/LinphoneChatRoomImpl.java @@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ package org.linphone.core; +import org.linphone.core.LinphoneChatMessage.StateListener; + class LinphoneChatRoomImpl implements LinphoneChatRoom { protected final long nativePtr; private native long getPeerAddress(long ptr); @@ -34,4 +36,14 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom { public void sendMessage(String message) { sendMessage(nativePtr,message); } + @Override + public void sendMessage(LinphoneChatMessage msg, StateListener listener) { + // TODO To be implemened + + } + @Override + public void sendMessage(Object opaque, String message) { + // ignore, deprecated. + + } } diff --git a/submodules/externals/exosip b/submodules/externals/exosip index 05978321c..b62c41677 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit 05978321cfc73a91a12c2a818a45a308f3f55a47 +Subproject commit b62c4167702f5333686754f55a2da81705e170ba diff --git a/submodules/linphone b/submodules/linphone index 976711219..fd4937409 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 976711219328335b36d21c3f3d233a8efce170e6 +Subproject commit fd4937409b089ba35c887dde134c2ab0864411ca