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

Prevent app from crashing

Browse source
This commit is contained in:
Sylvain Berfini 2012-11-22 15:19:14 +01:00
parent 4f43100a39
commit 2b561b5ca6
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -394,16 +394,29 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
} }
private void initializeMediaEncryptionPreferences() { private void initializeMediaEncryptionPreferences() {
LinphoneCore lc = LinphoneManager.getLc(); LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
List<CharSequence> mencEntries=new ArrayList<CharSequence>();
List<CharSequence> mencEntryValues=new ArrayList<CharSequence>();
mencEntries.add(getString(R.string.media_encryption_none));
mencEntryValues.add(getString(R.string.pref_media_encryption_key_none));
if (lc == null) {
CharSequence[] contents=new CharSequence[mencEntries.size()];
mencEntries.toArray(contents);
mencPref.setEntries(contents);
contents=new CharSequence[mencEntryValues.size()];
mencEntryValues.toArray(contents);
mencPref.setEntryValues(contents);
mencPref.setDefaultValue(getString(R.string.media_encryption_none));
return;
}
boolean hasZrtp = lc.mediaEncryptionSupported(MediaEncryption.ZRTP); boolean hasZrtp = lc.mediaEncryptionSupported(MediaEncryption.ZRTP);
boolean hasSrtp = lc.mediaEncryptionSupported(MediaEncryption.SRTP); boolean hasSrtp = lc.mediaEncryptionSupported(MediaEncryption.SRTP);
if (!hasSrtp && !hasZrtp){ if (!hasSrtp && !hasZrtp){
mencPref.setEnabled(false); mencPref.setEnabled(false);
}else{ }else{
List<CharSequence> mencEntries=new ArrayList<CharSequence>();
List<CharSequence> mencEntryValues=new ArrayList<CharSequence>();
mencEntries.add(getString(R.string.media_encryption_none));
mencEntryValues.add(getString(R.string.pref_media_encryption_key_none));
if (hasSrtp){ if (hasSrtp){
mencEntries.add(getString(R.string.media_encryption_srtp)); mencEntries.add(getString(R.string.media_encryption_srtp));
mencEntryValues.add(getString(R.string.pref_media_encryption_key_srtp)); mencEntryValues.add(getString(R.string.pref_media_encryption_key_srtp));