Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'newUI' of git.linphone.org:linphone-android into newUI

Browse source
This commit is contained in:
Sylvain Berfini 2012-09-05 14:08:21 +02:00
commit 656cf581af
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/raw/linphonerc
View file

@ -4,6 +4,8 @@ upload_bw=256
firewall_policy=0 firewall_policy=0
mtu=1300 mtu=1300
#adaptive_rate_control=1 #adaptive_rate_control=1
#activate_edge_workarounds=1
#edge_ping_time=200
[sip] [sip]
sip_port=5060 sip_port=5060
@ -18,7 +20,6 @@ default_proxy=0
auto_net_state_mon=0 auto_net_state_mon=0
keepalive_period=30000 keepalive_period=30000
auto_answer_replacing_calls=1 auto_answer_replacing_calls=1
media_encryption=zrtp
media_encryption_mandatory=0 media_encryption_mandatory=0
[rtp] [rtp]

12
src/org/linphone/core/LinphoneChatRoomImpl.java
View file

@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
package org.linphone.core; package org.linphone.core;
import org.linphone.core.LinphoneChatMessage.StateListener;
class LinphoneChatRoomImpl implements LinphoneChatRoom { class LinphoneChatRoomImpl implements LinphoneChatRoom {
protected final long nativePtr; protected final long nativePtr;
private native long getPeerAddress(long ptr); private native long getPeerAddress(long ptr);
@ -34,4 +36,14 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom {
public void sendMessage(String message) { public void sendMessage(String message) {
sendMessage(nativePtr,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.
}
} }

2
submodules/externals/exosip vendored

@ -1 +1 @@
Subproject commit 05978321cfc73a91a12c2a818a45a308f3f55a47 Subproject commit b62c4167702f5333686754f55a2da81705e170ba

2
submodules/linphone

@ -1 +1 @@
Subproject commit 976711219328335b36d21c3f3d233a8efce170e6 Subproject commit fd4937409b089ba35c887dde134c2ab0864411ca