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

Update belle-sip, linphone and msopenh264 submodules + activate AVPF when configuring linphone.org accounts.

Browse source
This commit is contained in:
Ghislain MARY 2014-06-03 15:11:01 +02:00
parent 1ae5147ef7
commit 788791e2af
5 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/org/linphone/LinphonePreferences.java
View file

@ -159,6 +159,8 @@ public class LinphonePreferences {
private String tempContactsParams; private String tempContactsParams;
private String tempExpire; private String tempExpire;
private TransportType tempTransport; private TransportType tempTransport;
private boolean tempAvpfEnabled = false;
private int tempAvpfRRInterval = 0;
private boolean tempEnabled = true; private boolean tempEnabled = true;
private boolean tempNoDefault = false; private boolean tempNoDefault = false;
@ -216,6 +218,16 @@ public class LinphonePreferences {
return this; 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) { public AccountBuilder setEnabled(boolean enable) {
tempEnabled = enable; tempEnabled = enable;
return this; return this;
@ -266,6 +278,9 @@ public class LinphonePreferences {
} catch (NumberFormatException nfe) { } } catch (NumberFormatException nfe) { }
} }
prxCfg.enableAvpf(tempAvpfEnabled);
prxCfg.setAvpfRRInterval(tempAvpfRRInterval);
LinphoneAuthInfo authInfo = LinphoneCoreFactory.instance().createAuthInfo(tempUsername, tempUserId, tempPassword, null, null, tempDomain); LinphoneAuthInfo authInfo = LinphoneCoreFactory.instance().createAuthInfo(tempUsername, tempUserId, tempPassword, null, null, tempDomain);
lc.addProxyConfig(prxCfg); lc.addProxyConfig(prxCfg);

2
src/org/linphone/setup/SetupActivity.java
View file

@ -303,6 +303,8 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
builder.setExpires("604800") builder.setExpires("604800")
.setOutboundProxyEnabled(true); .setOutboundProxyEnabled(true);
builder.setAvpfEnabled(true);
builder.setAvpfRRInterval(3);
mPrefs.setStunServer(getString(R.string.default_stun)); mPrefs.setStunServer(getString(R.string.default_stun));
mPrefs.setIceEnabled(true); mPrefs.setIceEnabled(true);
mPrefs.setPushNotificationEnabled(true); mPrefs.setPushNotificationEnabled(true);

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit ba7dfd9ed151a86413c135c662510e171aa230f1 Subproject commit 85ec68643fbe6976be85abcd77c1865c63a18154

2
submodules/linphone

@ -1 +1 @@
Subproject commit 7a85da0ff0070a3b7ff9b61a366d7d7a784407de Subproject commit 2498e3164a59283db6f2125b0a33b885d4c6a2f7

2
submodules/msopenh264

@ -1 +1 @@
Subproject commit 7babbc1e4c937062c8f94a712c4afef6c782b5f7 Subproject commit c871fcf27d125fb0a5f3c2f15595f59290b2e047