From 788791e2afff07435f6a4d9792240153a13eb2be Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 3 Jun 2014 15:11:01 +0200 Subject: [PATCH] Update belle-sip, linphone and msopenh264 submodules + activate AVPF when configuring linphone.org accounts. --- src/org/linphone/LinphonePreferences.java | 15 +++++++++++++++ src/org/linphone/setup/SetupActivity.java | 2 ++ submodules/belle-sip | 2 +- submodules/linphone | 2 +- submodules/msopenh264 | 2 +- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index d5db2e97c..713c31c75 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -159,6 +159,8 @@ public class LinphonePreferences { private String tempContactsParams; private String tempExpire; private TransportType tempTransport; + private boolean tempAvpfEnabled = false; + private int tempAvpfRRInterval = 0; private boolean tempEnabled = true; private boolean tempNoDefault = false; @@ -216,6 +218,16 @@ public class LinphonePreferences { return this; } + public AccountBuilder setAvpfEnabled(boolean enable) { + tempAvpfEnabled = enable; + return this; + } + + public AccountBuilder setAvpfRRInterval(int interval) { + tempAvpfRRInterval = interval; + return this; + } + public AccountBuilder setEnabled(boolean enable) { tempEnabled = enable; return this; @@ -266,6 +278,9 @@ public class LinphonePreferences { } catch (NumberFormatException nfe) { } } + prxCfg.enableAvpf(tempAvpfEnabled); + prxCfg.setAvpfRRInterval(tempAvpfRRInterval); + LinphoneAuthInfo authInfo = LinphoneCoreFactory.instance().createAuthInfo(tempUsername, tempUserId, tempPassword, null, null, tempDomain); lc.addProxyConfig(prxCfg); diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java index 981431aef..12cc2d840 100644 --- a/src/org/linphone/setup/SetupActivity.java +++ b/src/org/linphone/setup/SetupActivity.java @@ -303,6 +303,8 @@ public class SetupActivity extends FragmentActivity implements OnClickListener { builder.setExpires("604800") .setOutboundProxyEnabled(true); + builder.setAvpfEnabled(true); + builder.setAvpfRRInterval(3); mPrefs.setStunServer(getString(R.string.default_stun)); mPrefs.setIceEnabled(true); mPrefs.setPushNotificationEnabled(true); diff --git a/submodules/belle-sip b/submodules/belle-sip index ba7dfd9ed..85ec68643 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit ba7dfd9ed151a86413c135c662510e171aa230f1 +Subproject commit 85ec68643fbe6976be85abcd77c1865c63a18154 diff --git a/submodules/linphone b/submodules/linphone index 7a85da0ff..2498e3164 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7a85da0ff0070a3b7ff9b61a366d7d7a784407de +Subproject commit 2498e3164a59283db6f2125b0a33b885d4c6a2f7 diff --git a/submodules/msopenh264 b/submodules/msopenh264 index 7babbc1e4..c871fcf27 160000 --- a/submodules/msopenh264 +++ b/submodules/msopenh264 @@ -1 +1 @@ -Subproject commit 7babbc1e4c937062c8f94a712c4afef6c782b5f7 +Subproject commit c871fcf27d125fb0a5f3c2f15595f59290b2e047