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

Fix crash when deleting account + disabled delete button when there is no account to delete

Browse source
This commit is contained in:
Sylvain Berfini 2016-06-13 10:40:27 +02:00
parent 23b4eb71d8
commit fdcbbf5733
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/AccountPreferencesFragment.java
View file

@ -392,7 +392,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
} }
final Preference delete = manage.getPreference(2); final Preference delete = manage.getPreference(2);
delete.setEnabled(true); delete.setEnabled(!isNewAccount);
delete.setOnPreferenceClickListener(new OnPreferenceClickListener() { delete.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
mPrefs.deleteAccount(n); mPrefs.deleteAccount(n);

10
src/org/linphone/LinphonePreferences.java
View file

@ -728,6 +728,11 @@ public class LinphonePreferences {
} }
public void deleteAccount(int n) { public void deleteAccount(int n) {
LinphoneAuthInfo authInfo = getAuthInfo(n);
if (authInfo != null) {
getLc().removeAuthInfo(authInfo);
}
LinphoneProxyConfig proxyCfg = getProxyConfig(n); LinphoneProxyConfig proxyCfg = getProxyConfig(n);
if (proxyCfg != null) if (proxyCfg != null)
getLc().removeProxyConfig(proxyCfg); getLc().removeProxyConfig(proxyCfg);
@ -737,11 +742,6 @@ public class LinphonePreferences {
getLc().setDefaultProxyConfig(null); getLc().setDefaultProxyConfig(null);
} }
LinphoneAuthInfo authInfo = getAuthInfo(n);
if (authInfo != null) {
getLc().removeAuthInfo(authInfo);
}
getLc().refreshRegisters(); getLc().refreshRegisters();
} }
// End of accounts settings // End of accounts settings