allow disabling subscription, set default sip port to random because many android devices have port 5060 busy.

This commit is contained in:
Simon Morlat 2016-10-24 16:17:07 +02:00
parent d7aae46a9d
commit 660642a71c
5 changed files with 7 additions and 6 deletions

View file

@ -5,9 +5,11 @@ upload_bw=380
[sip]
contact="Linphone Android" <sip:linphone.android@unknown-host>
use_info=0
use_ipv6=0
use_ipv6=1
keepalive_period=30000
sip_port=-1
sip_tcp_port=-1
sip_tls_port=-1
[video]
size=qvga

View file

@ -15,7 +15,6 @@ ping_with_options=0
rls_uri=sip:rls@sip.linphone.org
use_rls_presence=1
[rtp]
audio_rtp_port=7076
video_rtp_port=9078

View file

@ -775,7 +775,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
mLc.setCallLogsDatabasePath(mCallLogDatabaseFile);
mLc.setFriendsDatabasePath(mFriendsDatabaseFile);
mLc.setUserCertificatesPath(mUserCertificatePath);
//subscribeFriendList(mPrefs.isFriendlistsubscriptionEnabled());
subscribeFriendList(mPrefs.isFriendlistsubscriptionEnabled());
//mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile);
enableDeviceRingtone(mPrefs.isDeviceRingtoneEnabled());

@ -1 +1 @@
Subproject commit f924f1fab4887af5249067df5b938aa5fd630af6
Subproject commit 3de689b92ebfb1c9b87151017f7a183698c936e9

@ -1 +1 @@
Subproject commit e310831d7de9ac4f95cba7a7fccab3406e53300c
Subproject commit 2698f84415009f2d0c245db2ae4da5c69889c928