From 48cf8a78131e655739ac47987ab87c835e5bc220 Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Date: Wed, 11 Dec 2013 15:00:43 -0500
Subject: [PATCH] * #36825: remove account_state_changed with code
---
.../fragments/GeneralAccountFragment.java | 24 +++++++++++--------
.../service/ConfigurationManagerCallback.java | 2 +-
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/org/sflphone/fragments/GeneralAccountFragment.java b/src/org/sflphone/fragments/GeneralAccountFragment.java
index 8cf5ab021..080087681 100644
--- a/src/org/sflphone/fragments/GeneralAccountFragment.java
+++ b/src/org/sflphone/fragments/GeneralAccountFragment.java
@@ -71,7 +71,7 @@ public class GeneralAccountFragment extends PreferenceFragment {
String tmp = new String();
for (int i = 0; i < p.mValue.length(); ++i) {
tmp += "*";
-
+
}
pref.setSummary(tmp);
} else {
@@ -101,20 +101,24 @@ public class GeneralAccountFragment extends PreferenceFragment {
Preference.OnPreferenceChangeListener changeBasicPreferenceListener = new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference instanceof CheckBoxPreference) {
- Log.i(TAG, "Changing preference value:" + newValue);
+ Log.i(TAG, "Changing preference value:" + newValue);
+ if (preference instanceof CheckBoxPreference) {
mCallbacks.getAccount().getBasicDetails().setDetailString(preference.getKey(), ((Boolean) newValue).toString());
- mCallbacks.getAccount().notifyObservers();
-
} else {
- preference.setSummary((CharSequence) newValue);
- Log.i(TAG, "Changing preference value:" + newValue);
- mCallbacks.getAccount().getBasicDetails().setDetailString(preference.getKey(), ((CharSequence) newValue).toString());
- mCallbacks.getAccount().notifyObservers();
+ if (preference instanceof PasswordPreference) {
+ String tmp = new String();
+ for (int i = 0; i < ((String) newValue).length(); ++i) {
+ tmp += "*";
- Log.i(TAG, "Observer count:" + mCallbacks.getAccount().countObservers());
+ }
+ preference.setSummary(tmp);
+ } else
+ preference.setSummary((CharSequence) newValue);
+
+ mCallbacks.getAccount().getBasicDetails().setDetailString(preference.getKey(), ((CharSequence) newValue).toString());
}
+ mCallbacks.getAccount().notifyObservers();
return true;
}
};
diff --git a/src/org/sflphone/service/ConfigurationManagerCallback.java b/src/org/sflphone/service/ConfigurationManagerCallback.java
index c6a9e0932..6cdd0f715 100644
--- a/src/org/sflphone/service/ConfigurationManagerCallback.java
+++ b/src/org/sflphone/service/ConfigurationManagerCallback.java
@@ -85,7 +85,7 @@ public class ConfigurationManagerCallback extends ConfigurationCallback {
@Override
public void on_account_state_changed_with_code(String accoundID, String state, int code) {
- sendAccountsStateChangedMessage(accoundID, state, code);
+// sendAccountsStateChangedMessage(accoundID, state, code);
}
private void sendAccountsStateChangedMessage(String accoundID, String state, int code) {
--
GitLab