commit cf74fe2b5fab4e7c4016e12c6909e70ea625cc02
author Hung-ying Tyan <tyanh@google.com> Thu Sep 02 23:15:46 2010 +0800
committer Hung-ying Tyan <tyanh@google.com> Fri Sep 03 00:30:56 2010 +0800
tree 50c80facfc6e84eac164900da842499a8ca8f325
parent 5afaad1ab34d77edec65afeb09c5a17ad9be51c6

SipEditor: handle default display name.

Change-Id: Iaca0cc129d97503f4d21c7326a14609a95b56fab

src/com/android/phone/sip/SipEditor.java

diff --git a/src/com/android/phone/sip/SipEditor.java b/src/com/android/phone/sip/SipEditor.java
index 55cdcc6..8453a46 100644
--- a/src/com/android/phone/sip/SipEditor.java
+++ b/src/com/android/phone/sip/SipEditor.java
@@ -66,6 +66,7 @@
     private PrimaryAccountSelector mPrimaryAccountSelector;
     private AdvancedSettings mAdvancedSettings;
     private SipSharedPreferences mSharedPreferences;
+    private boolean mDisplayNameSet;
 
     enum PreferenceKey {
         ProfileName(R.string.profile_name, EMPTY),
@@ -249,6 +250,16 @@
         } else {
             pref.setSummary(value);
         }
+
+        if (pref instanceof EditTextPreference) {
+            ((EditTextPreference) pref).setText(value);
+        }
+
+        if (pref == PreferenceKey.DisplayName.preference) {
+            checkIfDisplayNameSet();
+        } else if (!mDisplayNameSet) {
+            setDisplayName();
+        }
         return true;
     }
 
@@ -294,6 +305,7 @@
                         : key.defaultValue);
             }
         }
+        checkIfDisplayNameSet();
     }
 
     private boolean isChecked(PreferenceKey key) {
@@ -345,6 +357,22 @@
         }
     }
 
+    private void checkIfDisplayNameSet() {
+        String displayName = getValue(PreferenceKey.DisplayName);
+        mDisplayNameSet = !TextUtils.isEmpty(displayName)
+                && !displayName.equals(getDefaultDisplayName());
+    }
+
+    private void setDisplayName() {
+        setValue(PreferenceKey.DisplayName, getDefaultDisplayName());
+    }
+
+    private String getDefaultDisplayName() {
+        String username = getValue(PreferenceKey.Username);
+        String domain = getValue(PreferenceKey.DomainAddress);
+        return username + "@" + domain;
+    }
+
     private class PrimaryAccountSelector {
         private CheckBoxPreference mCheckbox;