commit 8c91dfb9ef1c7ac1a4b2feed0b9a8585d4873542
author Dmitri Plotnikov <dplotnikov@google.com> Fri Oct 15 10:48:00 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Fri Oct 15 10:48:00 2010 -0700
tree 5e3f021b19cabf71e118aea3cbe6f62acf7e933a
parent b8073e3f8318fcaa9f0655dc298ea043dfedf2b8

Conact editor to remain open after a manual join

Bug: 3060255
Change-Id: Ice2bd7d4f1473d3e2c81d6ccd4e3a67428b2bf51

src/com/android/contacts/activities/ContactEditorActivity.java

diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index 18ce7fa..ba37da4 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -120,7 +120,7 @@
         }
 
         @Override
-        public void onAggregationChangeFinished(Uri newLookupUri) {
+        public void onContactSplit(Uri newLookupUri) {
             finish();
         }
 

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 366aadc..adbbe72 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/views/editor/ContactEditorFragment.java
@@ -768,7 +768,7 @@
                 break;
             case SaveMode.SPLIT:
                 if (mListener != null) {
-                    mListener.onAggregationChangeFinished(contactLookupUri);
+                    mListener.onContactSplit(contactLookupUri);
                 } else {
                     Log.d(TAG, "No listener registered, can not call onSplitFinished");
                 }
@@ -863,9 +863,12 @@
         builder.withValue(RawContacts.NAME_VERIFIED, 1);
         operations.add(builder.build());
 
+        boolean success = false;
         // Apply all aggregation exceptions as one batch
         try {
             resolver.applyBatch(ContactsContract.AUTHORITY, operations);
+            Toast.makeText(mContext, R.string.contactsJoinedMessage, Toast.LENGTH_LONG).show();
+            success = true;
         } catch (RemoteException e) {
             Log.e(TAG, "Failed to apply aggregation exception batch", e);
             Toast.makeText(mContext, R.string.contactSavedErrorToast, Toast.LENGTH_LONG).show();
@@ -874,14 +877,8 @@
             Toast.makeText(mContext, R.string.contactSavedErrorToast, Toast.LENGTH_LONG).show();
         }
 
-        Toast.makeText(mContext, R.string.contactsJoinedMessage, Toast.LENGTH_LONG).show();
-
-        // We pass back the Uri of the previous Contact (pre-join). While this is not correct,
-        // the provider will be able to later figure out the correct new aggregate
-        if (mListener != null) {
-            mListener.onAggregationChangeFinished(mLookupUri);
-        } else {
-            Log.d(TAG, "Listener is null. Can not call onAggregationChangeFinished");
+        if (success) {
+            onSaveCompleted(true, SaveMode.RELOAD, mLookupUri);
         }
     }
 
@@ -906,11 +903,11 @@
         void onContactNotFound();
 
         /**
-         * Contact was split or joined, so we can close now.
+         * Contact was split, so we can close now.
          * @param newLookupUri The lookup uri of the new contact that should be shown to the user.
          * The editor tries best to chose the most natural contact here.
          */
-        void onAggregationChangeFinished(Uri newLookupUri);
+        void onContactSplit(Uri newLookupUri);
 
         /**
          * User was presented with an account selection and couldn't decide.