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

Other changes for release

Browse source
This commit is contained in:
Sylvain Berfini 2012-12-13 14:32:50 +01:00
parent eec90a1647
commit f78aee1efe
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -8,3 +8,4 @@ project.properties
tests/*$py.class tests/*$py.class
tests/build.xml tests/build.xml
res/.DS_Store res/.DS_Store
bc-android.keystore

1
Makefile
View file

@ -98,6 +98,7 @@ install-apk: generate-apk
ant installd ant installd
release: update-project release: update-project
ant clean
ant release ant release
run-linphone: run-linphone:

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

@ -227,7 +227,10 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
boolean isMainAccountLinphoneDotOrg = domain.equals(getString(R.string.default_domain)); boolean isMainAccountLinphoneDotOrg = domain.equals(getString(R.string.default_domain));
if (isMainAccountLinphoneDotOrg) { if (isMainAccountLinphoneDotOrg) {
writePreference(R.string.pref_proxy_key, domain + ":5223"); if (getResources().getBoolean(R.bool.disable_all_security_features_for_markets))
writePreference(R.string.pref_proxy_key, domain + ":5228");
else
writePreference(R.string.pref_proxy_key, domain + ":5223");
writePreference(R.string.pref_enable_outbound_proxy_key, true); writePreference(R.string.pref_enable_outbound_proxy_key, true);
writePreference(R.string.pref_stun_server_key, getString(R.string.default_stun)); writePreference(R.string.pref_stun_server_key, getString(R.string.default_stun));