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

Some changes to prepare the market release

Browse source
This commit is contained in:
Sylvain Berfini 2012-12-13 11:55:40 +01:00
parent ae048a4caf
commit e597f769e5
6 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -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

1
res/raw-sw600dp/linphonerc
View file

@ -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]

1
res/values/non_localizable_custom.xml
View file

@ -49,6 +49,7 @@
<bool name="allow_edit_in_dialer">true</bool>
<bool name="forbid_self_call">false</bool>
<bool name="disable_chat">false</bool>
<bool name="disable_all_security_features_for_markets">true</bool>
<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
</resources>

6
src/org/linphone/LinphoneActivity.java
View file

@ -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);

8
src/org/linphone/PreferencesFragment.java
View file

@ -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);

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

@ -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);