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

Fix possibly crash on account setting

Browse source
This commit is contained in:
Erwan Croze 2017-05-22 17:08:08 +02:00
parent 37593f9883
commit 7d507bf329
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
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.LinphoneAccountCreator;
import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreException;
import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreFactory;
import org.linphone.core.LinphoneProxyConfig;
import org.linphone.mediastream.Log; import org.linphone.mediastream.Log;
import org.linphone.ui.PreferencesListFragment; import org.linphone.ui.PreferencesListFragment;
@ -300,6 +301,8 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen
if (isNewAccount) { if (isNewAccount) {
} else { } else {
if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null
&& LinphoneManager.getLc().getProxyConfigList() != null
&& LinphoneManager.getLc().getProxyConfigList().length > n
&& LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy() != null) && LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy() != null)
LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().enableIce(value); LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().enableIce(value);
else else
@ -316,6 +319,8 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen
if (isNewAccount) { if (isNewAccount) {
} else { } else {
if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null
&& LinphoneManager.getLc().getProxyConfigList() != null
&& LinphoneManager.getLc().getProxyConfigList().length > n
&& LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy() != null) { && LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy() != null) {
LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().setStunServer(value); LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().setStunServer(value);
preference.setSummary(value); preference.setSummary(value);
@ -329,6 +334,12 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen
private void initAccountPreferencesFields(PreferenceScreen parent) { private void initAccountPreferencesFields(PreferenceScreen parent) {
boolean isDefaultAccount = mPrefs.getDefaultAccountIndex() == n; boolean isDefaultAccount = mPrefs.getDefaultAccountIndex() == n;
LinphoneProxyConfig proxyConfig = null;
if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null &&
LinphoneManager.getLc().getProxyConfigList() != null &&
LinphoneManager.getLc().getProxyConfigList().length > n) {
proxyConfig = (LinphoneProxyConfig) LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy();
}
accountCreator = LinphoneCoreFactory.instance().createAccountCreator(LinphoneManager.getLc() accountCreator = LinphoneCoreFactory.instance().createAccountCreator(LinphoneManager.getLc()
, LinphonePreferences.instance().getXmlrpcUrl()); , LinphonePreferences.instance().getXmlrpcUrl());
@ -379,14 +390,12 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen
CheckBoxPreference ice = (CheckBoxPreference) advanced.getPreference(1); CheckBoxPreference ice = (CheckBoxPreference) advanced.getPreference(1);
ice.setOnPreferenceChangeListener(iceChangedListener); ice.setOnPreferenceChangeListener(iceChangedListener);
if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null if (proxyConfig != null)
&& LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy() != null)
ice.setChecked(LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().iceEnabled()); ice.setChecked(LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().iceEnabled());
EditTextPreference stunTurn = (EditTextPreference) advanced.getPreference(2); EditTextPreference stunTurn = (EditTextPreference) advanced.getPreference(2);
stunTurn.setOnPreferenceChangeListener(stunTurnChangedListener); stunTurn.setOnPreferenceChangeListener(stunTurnChangedListener);
if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null if (proxyConfig != null) {
&& LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy() != null) {
stunTurn.setText(LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().getStunServer()); stunTurn.setText(LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().getStunServer());
stunTurn.setSummary(LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().getStunServer()); stunTurn.setSummary(LinphoneManager.getLc().getProxyConfigList()[n].getNatPolicy().getStunServer());
} }