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

Fix possible crash when account doesn't have natpolicy

Browse source
This commit is contained in:
Erwan Croze 2017-06-01 12:18:01 +02:00
parent 72d56e628a
commit 3724d143cf
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/android/org/linphone/AccountPreferencesFragment.java
View file

@ -26,6 +26,7 @@ import org.linphone.assistant.AssistantActivity;
import org.linphone.core.LinphoneAccountCreator;
import org.linphone.core.LinphoneCoreException;
import org.linphone.core.LinphoneCoreFactory;
import org.linphone.core.LinphoneNatPolicy;
import org.linphone.core.LinphoneProxyConfig;
import org.linphone.mediastream.Log;
import org.linphone.ui.PreferencesListFragment;
@ -334,11 +335,11 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen
private void initAccountPreferencesFields(PreferenceScreen parent) {
boolean isDefaultAccount = mPrefs.getDefaultAccountIndex() == n;
LinphoneProxyConfig proxyConfig = null;
LinphoneNatPolicy natPolicy = null;
if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null &&
LinphoneManager.getLc().getProxyConfigList() != null &&
LinphoneManager.getLc().getProxyConfigList().length > n) {
proxyConfig = (LinphoneProxyConfig) LinphoneManager.getLc().getProxyConfigList()[n];
natPolicy = LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy();
}
accountCreator = LinphoneCoreFactory.instance().createAccountCreator(LinphoneManager.getLc()
@ -390,14 +391,14 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen
CheckBoxPreference ice = (CheckBoxPreference) advanced.getPreference(1);
ice.setOnPreferenceChangeListener(iceChangedListener);
if (proxyConfig != null)
ice.setChecked(LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().iceEnabled());
if (natPolicy != null)
ice.setChecked(natPolicy.iceEnabled());
EditTextPreference stunTurn = (EditTextPreference) advanced.getPreference(2);
stunTurn.setOnPreferenceChangeListener(stunTurnChangedListener);
if (proxyConfig != null) {
stunTurn.setText(LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().getStunServer());
stunTurn.setSummary(LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().getStunServer());
if (natPolicy != null) {
stunTurn.setText(natPolicy.getStunServer());
stunTurn.setSummary(natPolicy.getStunServer());
}
mProxyPreference = (EditTextPreference) advanced.getPreference(3);