diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0a44dbbb14621c8cc1b098ed820b8f5fb44cd392..1529fdb8008363b0462e526cf7e95b20c6010174 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -33,8 +33,8 @@ as that of the covered work. <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.sflphone" android:installLocation="auto" - android:versionCode="10" - android:versionName="1.2.3.15" > + android:versionCode="11" + android:versionName="1.2.3.16" > <supports-screens android:anyDensity="true" diff --git a/src/org/sflphone/fragments/GeneralAccountFragment.java b/src/org/sflphone/fragments/GeneralAccountFragment.java index 90187993eea5fad8b86986594b00f2299cd1b227..4c1574b99564817335274102e1f033729eed98cf 100644 --- a/src/org/sflphone/fragments/GeneralAccountFragment.java +++ b/src/org/sflphone/fragments/GeneralAccountFragment.java @@ -32,6 +32,7 @@ package org.sflphone.fragments; import org.sflphone.R; import org.sflphone.account.AccountDetail; +import org.sflphone.account.AccountDetailBasic; import org.sflphone.model.Account; import org.sflphone.views.PasswordPreference; @@ -134,19 +135,23 @@ public class GeneralAccountFragment extends PreferenceFragment { Log.i(TAG, "Changing preference value:" + newValue); if (preference instanceof CheckBoxPreference) { - mCallbacks.getAccount().getBasicDetails().setDetailString(preference.getKey(), ((Boolean) newValue).toString()); + mCallbacks.getAccount().getBasicDetails().setDetailString(preference.getKey(), newValue.toString()); } else { if (preference instanceof PasswordPreference) { String tmp = new String(); for (int i = 0; i < ((String) newValue).length(); ++i) { tmp += "*"; - } + mCallbacks.getAccount().getCredentials().get(0).setDetailString(preference.getKey(), newValue.toString()); preference.setSummary(tmp); - } else + } else if(preference.getKey().contentEquals(AccountDetailBasic.CONFIG_ACCOUNT_USERNAME)) { + mCallbacks.getAccount().getCredentials().get(0).setDetailString(preference.getKey(), newValue.toString()); + preference.setSummary((CharSequence) newValue); + } else { preference.setSummary((CharSequence) newValue); + } - mCallbacks.getAccount().getBasicDetails().setDetailString(preference.getKey(), ((CharSequence) newValue).toString()); + mCallbacks.getAccount().getBasicDetails().setDetailString(preference.getKey(), newValue.toString()); } mCallbacks.getAccount().notifyObservers(); return true;