From 03bd0e5c7bc94d7c7871172e3c62321eea8ab89c Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Fri, 5 Sep 2014 10:13:12 +0200 Subject: [PATCH] Fix crash when username or domain is null --- src/org/linphone/AccountPreferencesFragment.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/org/linphone/AccountPreferencesFragment.java index 390d954db..695bd565f 100644 --- a/src/org/linphone/AccountPreferencesFragment.java +++ b/src/org/linphone/AccountPreferencesFragment.java @@ -65,9 +65,14 @@ public class AccountPreferencesFragment extends PreferencesListFragment { manageAccountPreferencesFields(screen); } + public static boolean isEditTextEmpty(String s){ + return s.equals(""); // really empty. + } + OnPreferenceChangeListener usernameChangedListener = new OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { + if(isEditTextEmpty(newValue.toString())) return false; mPrefs.setAccountUsername(n, newValue.toString()); preference.setSummary(newValue.toString()); return true; @@ -84,6 +89,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment { OnPreferenceChangeListener passwordChangedListener = new OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { + if(isEditTextEmpty(newValue.toString())) return false; mPrefs.setAccountPassword(n, newValue.toString()); return true; } @@ -91,6 +97,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment { OnPreferenceChangeListener domainChangedListener = new OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { + if(isEditTextEmpty(newValue.toString())) return false; mPrefs.setAccountDomain(n, newValue.toString()); preference.setSummary(newValue.toString()); return true;