From e597f769e5b8a1aa1a28428cd84f454e3e102413 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 13 Dec 2012 11:55:40 +0100 Subject: [PATCH] Some changes to prepare the market release --- Makefile | 8 ++++---- res/raw-sw600dp/linphonerc | 1 - res/values/non_localizable_custom.xml | 1 + src/org/linphone/LinphoneActivity.java | 6 +++++- src/org/linphone/PreferencesFragment.java | 8 +++++--- src/org/linphone/setup/SetupActivity.java | 5 ++++- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index d618cfca4..44b51a2e1 100644 --- a/Makefile +++ b/Makefile @@ -5,17 +5,17 @@ NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" ) TOPDIR=$(shell pwd) PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon) LINPHONE_VERSION=$(shell cd submodules/linphone && git describe) -ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | nl -ba | grep android | sort | tail -n1 | cut -f2-) +ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1) BUILD_X264=1 BUILD_AMRNB=full # 0, light or full -BUILD_AMRWB=1 +BUILD_AMRWB=0 BUILD_GPLV3_ZRTP=0 BUILD_SILK=1 -BUILD_G729=1 +BUILD_G729=0 BUILD_TUNNEL=0 BUILD_WEBRTC_AECM=1 -BUILD_FOR_X86=0 +BUILD_FOR_X86=1 USE_JAVAH=1 all: update-project prepare-sources install-apk run-linphone diff --git a/res/raw-sw600dp/linphonerc b/res/raw-sw600dp/linphonerc index 692dcbd17..9678c32db 100644 --- a/res/raw-sw600dp/linphonerc +++ b/res/raw-sw600dp/linphonerc @@ -18,7 +18,6 @@ default_proxy=0 auto_net_state_mon=0 keepalive_period=30000 auto_answer_replacing_calls=1 -media_encryption=zrtp media_encryption_mandatory=0 [rtp] diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml index 39f33878e..3a556ae75 100644 --- a/res/values/non_localizable_custom.xml +++ b/res/values/non_localizable_custom.xml @@ -49,6 +49,7 @@ true false false + true linphone-android@belledonne-communications.com diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index d3dd11734..6c25f894a 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -142,7 +142,11 @@ public class LinphoneActivity extends FragmentActivity implements boolean useFirstLoginActivity = getResources().getBoolean(R.bool.use_first_login_activity); SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this); if (useFirstLoginActivity && !pref.getBoolean(getString(R.string.first_launch_suceeded_once_key), false)) { - startActivityForResult(new Intent().setClass(this, SetupActivity.class), FIRST_LOGIN_ACTIVITY); + if (pref.getInt(getString(R.string.pref_extra_accounts), -1) > -1) { + pref.edit().putBoolean(getString(R.string.first_launch_suceeded_once_key), true); + } else { + startActivityForResult(new Intent().setClass(this, SetupActivity.class), FIRST_LOGIN_ACTIVITY); + } } setContentView(R.layout.main); diff --git a/src/org/linphone/PreferencesFragment.java b/src/org/linphone/PreferencesFragment.java index 7453df8c3..b5a067879 100644 --- a/src/org/linphone/PreferencesFragment.java +++ b/src/org/linphone/PreferencesFragment.java @@ -419,7 +419,7 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa mencEntries.add(getString(R.string.media_encryption_none)); mencEntryValues.add(getString(R.string.pref_media_encryption_key_none)); - if (lc == null) { + if (lc == null || getResources().getBoolean(R.bool.disable_all_security_features_for_markets)) { CharSequence[] contents=new CharSequence[mencEntries.size()]; mencEntries.toArray(contents); mencPref.setEntries(contents); @@ -462,8 +462,10 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa mencEntries.add(getString(R.string.pref_transport_tcp)); mencEntryValues.add(getString(R.string.pref_transport_tcp_key)); - mencEntries.add(getString(R.string.pref_transport_tls)); - mencEntryValues.add(getString(R.string.pref_transport_tls_key)); + if (!getResources().getBoolean(R.bool.disable_all_security_features_for_markets)) { + mencEntries.add(getString(R.string.pref_transport_tls)); + mencEntryValues.add(getString(R.string.pref_transport_tls_key)); + } ListPreference transport = (ListPreference) findPreference(pref_transport_key); diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java index 2a191213c..e3652c4c9 100644 --- a/src/org/linphone/setup/SetupActivity.java +++ b/src/org/linphone/setup/SetupActivity.java @@ -230,7 +230,10 @@ public class SetupActivity extends FragmentActivity implements OnClickListener { writePreference(R.string.pref_ice_enable_key, true); writePreference(R.string.pref_push_notification_key, true); - writePreference(R.string.pref_transport_key, getString(R.string.pref_transport_tls_key)); + if (getResources().getBoolean(R.bool.disable_all_security_features_for_markets)) + writePreference(R.string.pref_transport_key, getString(R.string.pref_transport_tcp_key)); + else + writePreference(R.string.pref_transport_key, getString(R.string.pref_transport_tls_key)); } } else { writePreference(getString(R.string.pref_username_key) + newAccountId, username);