commit 0c708094307e6c6b782095c854a1b545b6972b86
author Dmitri Plotnikov <dplotnikov@google.com> Sun Jan 16 16:40:34 2011 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Sun Jan 16 16:41:02 2011 -0800
tree b3f5cb3ea2194e28b5fce362a8f1185f5377564c
parent e9ec5ddb542787b7b5d94d9ea59b05d1f405c5aa

Preserving list selection when list is populated with stale data

Bug: 3352121
Change-Id: I7a553dbdf7d8a0e5d2af8536b8396ecd56b4a2ba

src/com/android/contacts/list/ContactBrowseListFragment.java

diff --git a/src/com/android/contacts/list/ContactBrowseListFragment.java b/src/com/android/contacts/list/ContactBrowseListFragment.java
index 3d53da8..1385c8b 100644
--- a/src/com/android/contacts/list/ContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/ContactBrowseListFragment.java
@@ -336,6 +336,9 @@
             if (mSelectedContactUri.toString().startsWith(Contacts.CONTENT_LOOKUP_URI.toString())) {
                 List<String> pathSegments = mSelectedContactUri.getPathSegments();
                 mSelectedContactLookupKey = Uri.encode(pathSegments.get(2));
+                if (mSelectedContactUri.getPathSegments().size() >= 3) {
+                    mSelectedContactId = ContentUris.parseId(mSelectedContactUri);
+                }
             } else if (mSelectedContactUri.toString().startsWith(Contacts.CONTENT_URI.toString()) &&
                     mSelectedContactUri.getPathSegments().size() >= 2) {
                 mSelectedContactLookupKey = null;

src/com/android/contacts/list/ContactListAdapter.java

diff --git a/src/com/android/contacts/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
index 0a2b104..ffe9fc6 100644
--- a/src/com/android/contacts/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -320,7 +320,8 @@
                     offset = cursor.getPosition();
                     break;
                 }
-            } else {
+            }
+            if (mSelectedContactId != 0) {
                 long contactId = cursor.getLong(CONTACT_ID_COLUMN_INDEX);
                 if (contactId == mSelectedContactId) {
                     offset = cursor.getPosition();