commit e579a175bdc18153014da00d989cf0a5343d25a9
author Dmitri Plotnikov <dplotnikov@google.com> Tue Aug 10 17:07:03 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Tue Aug 10 17:07:03 2010 -0700
tree 09ed49c560674db424bfcd33c2c356e1cdda7706
parent 4e0ce3fb44125453e0ad723d7e3d3e89ad639e01

Fixing the contact rebase issue

Change-Id: I51c3774c5352e207807aa492bc2f69dc417ce7b2

src/com/android/contacts/views/editor/ContactEditorFragment.java

diff --git a/src/com/android/contacts/views/editor/ContactEditorFragment.java b/src/com/android/contacts/views/editor/ContactEditorFragment.java
index 651a6f1..611d7fd 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/views/editor/ContactEditorFragment.java
@@ -50,6 +50,7 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Entity;
 import android.content.Intent;
 import android.content.Loader;
 import android.content.OperationApplicationException;
@@ -104,7 +105,6 @@
     private static final String KEY_VIEW_ID_GENERATOR = "viewidgenerator";
     private static final String KEY_CURRENT_PHOTO_FILE = "currentphotofile";
     private static final String KEY_QUERY_SELECTION = "queryselection";
-    private static final String KEY_QUERY_SELECTION_ARGS = "queryselectionargs";
     private static final String KEY_CONTACT_ID_FOR_JOIN = "contactidforjoin";
 
     private static final int SAVE_MODE_DEFAULT = 0;
@@ -134,7 +134,6 @@
     private Listener mListener;
 
     private String mQuerySelection;
-    private String[] mQuerySelectionArgs;
 
     private long mContactIdForJoin;
 
@@ -216,7 +215,6 @@
                 mCurrentPhotoFile = new File(fileName);
             }
             mQuerySelection = savedState.getString(KEY_QUERY_SELECTION);
-            mQuerySelectionArgs = savedState.getStringArray(KEY_QUERY_SELECTION_ARGS);
             mContactIdForJoin = savedState.getLong(KEY_CONTACT_ID_FOR_JOIN);
         }
     }
@@ -228,7 +226,20 @@
             return;
         }
 
-        mState = EntityDeltaList.fromIterator(data.getEntities().iterator());
+        ArrayList<Entity> entities = data.getEntities();
+        StringBuilder sb = new StringBuilder(RawContacts._ID + " IN(");
+        int count = entities.size();
+        for (int i = 0; i < count; i++) {
+            if (i > 0) {
+                sb.append(',');
+            }
+            sb.append(entities.get(i).getEntityValues().get(RawContacts._ID));
+        }
+        sb.append(")");
+        mQuerySelection = sb.toString();
+        mState = EntityDeltaList.fromIterator(entities.iterator());
+
+
         // TODO: Merge in Intent parameters can only be done on the first load.
         // The behaviour for subsequent loads is probably broken, so fix this
         final boolean hasExtras = mIntentExtras != null && mIntentExtras.size() > 0;
@@ -991,7 +1002,7 @@
                     // Version consistency failed, re-parent change and try again
                     Log.w(TAG, "Version consistency failed, re-parenting: " + e.toString());
                     final EntityDeltaList newState = EntityDeltaList.fromQuery(resolver,
-                            target.mQuerySelection, target.mQuerySelectionArgs, null);
+                            target.mQuerySelection, null, null);
                     state = EntityDeltaList.mergeAfter(newState, state);
                 }
             }
@@ -1053,7 +1064,6 @@
             outState.putString(KEY_CURRENT_PHOTO_FILE, mCurrentPhotoFile.toString());
         }
         outState.putString(KEY_QUERY_SELECTION, mQuerySelection);
-        outState.putStringArray(KEY_QUERY_SELECTION_ARGS, mQuerySelectionArgs);
         outState.putLong(KEY_CONTACT_ID_FOR_JOIN, mContactIdForJoin);
         super.onSaveInstanceState(outState);
     }