commit 40088c27ea8a17313c901169f3cd282862c82c2b
author Daniel Lehmann <lehmannd@google.com> Tue Mar 08 18:41:44 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 08 18:41:44 2011 -0800
tree 3ea5c4351676bdc06317a7d7b33dc5ae8a4a7201
parent cff14a9f463e0f62d91c758333d0468d05c49106
parent 60b239c24c05233bbf3f7cb45697252e15ec76cc

am 60b239c2: Treat empty and null strings equally. Fixes a data loss on e.g. rotation

* commit '60b239c24c05233bbf3f7cb45697252e15ec76cc':
  Treat empty and null strings equally. Fixes a data loss on e.g. rotation

src/com/android/contacts/editor/LabeledEditorView.java

diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index ebd35f9..a6815a7 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -341,8 +341,12 @@
     }
 
     protected boolean isFieldChanged(String column, String value) {
-        String oldValue = mEntry.getAsString(column);
-        return !TextUtils.equals(oldValue, value);
+        final String dbValue = mEntry.getAsString(column);
+        // nullable fields (e.g. Middle Name) are usually represented as empty columns,
+        // so lets treat null and empty space equivalently here
+        final String dbValueNoNull = dbValue == null ? "" : dbValue;
+        final String valueNoNull = value == null ? "" : value;
+        return !TextUtils.equals(dbValueNoNull, valueNoNull);
     }
 
     protected void rebuildValues() {