From 660642a71cf33410ecc1f0e9165b56b16c939ce1 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 24 Oct 2016 16:17:07 +0200 Subject: [PATCH] allow disabling subscription, set default sip port to random because many android devices have port 5060 busy. --- res/raw/linphonerc_default | 6 ++++-- res/raw/linphonerc_factory | 1 - src/org/linphone/LinphoneManager.java | 2 +- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/res/raw/linphonerc_default b/res/raw/linphonerc_default index e390d294d..c2acb3c86 100644 --- a/res/raw/linphonerc_default +++ b/res/raw/linphonerc_default @@ -5,9 +5,11 @@ upload_bw=380 [sip] contact="Linphone Android" 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 diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory index ec91ff302..8723a1069 100644 --- a/res/raw/linphonerc_factory +++ b/res/raw/linphonerc_factory @@ -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 diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index a03724d24..f9fee6cce 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -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()); diff --git a/submodules/belle-sip b/submodules/belle-sip index f924f1fab..3de689b92 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit f924f1fab4887af5249067df5b938aa5fd630af6 +Subproject commit 3de689b92ebfb1c9b87151017f7a183698c936e9 diff --git a/submodules/linphone b/submodules/linphone index e310831d7..2698f8441 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e310831d7de9ac4f95cba7a7fccab3406e53300c +Subproject commit 2698f84415009f2d0c245db2ae4da5c69889c928