commit 21cc0a2d9ce5c6ac5f90f51a59ccafacdb4cf7a5
author Mindy Pereira <mindyp@google.com> Thu Jun 23 17:11:06 2011 -0700
committer Mindy Pereira <mindyp@google.com> Thu Jun 23 17:14:07 2011 -0700
tree 34456cab88b99d7c261b4280a5fa9a3b73d895d0
parent 79fb4360e567c5ce9e80142af2807126d3bb67f0

Make sure we dont use textwatchers or commit chips incorrectly.

1) Never use textwatchers when there are any pending chips. These
may be because there are recipients that were hidden when the more
chip was shown, or because we are parsing appended recipients.
2) turn off item clicks for alternates before we send the dismiss event,
since we dont dismiss immediately and we want to be sure the user cannot
click 2 recipients if the device is running slowly.

Change-Id: I53ae04a0f7c23f4ef7396ea203d8d1bb0a1b6e34

src/com/android/ex/chips/RecipientEditTextView.java

diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java
index 85a3f3e..a65ac57 100644
--- a/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/src/com/android/ex/chips/RecipientEditTextView.java
@@ -131,7 +131,7 @@
      */
     private OnItemClickListener mAlternatesListener;
 
-    private int mCheckedItem;
+    private int mCheckedItem;  
 
     private TextWatcher mTextWatcher;
 
@@ -155,10 +155,11 @@
             @Override
             public void onItemClick(AdapterView<?> adapterView,View view, int position,
                     long rowId) {
+                mAlternatesPopup.setOnItemClickListener(null);
                 replaceChip(mSelectedChip, ((RecipientAlternatesAdapter) adapterView.getAdapter())
                         .getRecipientEntry(position));
                 Message delayed = Message.obtain(mHandler, DISMISS);
-                delayed.obj = RecipientEditTextView.this.mAlternatesPopup;
+                delayed.obj = mAlternatesPopup;
                 mHandler.sendMessageDelayed(delayed, DISMISS_DELAY);
                 clearComposingText();
             }
@@ -627,7 +628,7 @@
     }
 
     private boolean shouldCreateChip(int start, int end) {
-        if (enoughToFilter()) {
+        if (hasFocus() && enoughToFilter()) {
             RecipientChip[] chips = getSpannable().getSpans(start, end, RecipientChip.class);
             if ((chips == null || chips.length == 0)) {
                 return true;
@@ -775,7 +776,7 @@
         alternatesPopup.setWidth(width);
         alternatesPopup.setAnchorView(anchorView);
         alternatesPopup.setAdapter(createAlternatesAdapter(currentChip));
-        alternatesPopup.setOnItemClickListener(mAlternatesListener); // currentChip);
+        alternatesPopup.setOnItemClickListener(mAlternatesListener);
         alternatesPopup.show();
         ListView listView = alternatesPopup.getListView();
         listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
@@ -983,26 +984,25 @@
         ImageSpan moreSpan = new ImageSpan(result);
         Spannable spannable = getSpannable();
         // Remove the overage chips.
-        RecipientChip[] chips = spannable.getSpans(0, text.length(), RecipientChip.class);
-        if (chips == null || chips.length == 0) {
+        if (recipients == null || recipients.length == 0) {
             Log.w(TAG,
                 "We have recipients. Tt should not be possible to have zero RecipientChips.");
             return null;
         }
-        mRemovedSpans = new ArrayList<RecipientChip>(chips.length);
+        mRemovedSpans = new ArrayList<RecipientChip>();
         int totalReplaceStart = 0;
         int totalReplaceEnd = 0;
-        for (int i = numRecipients - overage; i < chips.length; i++) {
-            mRemovedSpans.add(chips[i]);
+        for (int i = numRecipients - overage; i < recipients.length; i++) {
+            mRemovedSpans.add(recipients[i]);
             if (i == numRecipients - overage) {
-                totalReplaceStart = spannable.getSpanStart(chips[i]);
+                totalReplaceStart = spannable.getSpanStart(recipients[i]);
             }
-            if (i == chips.length - 1) {
-                totalReplaceEnd = spannable.getSpanEnd(chips[i]);
+            if (i == recipients.length - 1) {
+                totalReplaceEnd = spannable.getSpanEnd(recipients[i]);
             }
-            chips[i].storeChipStart(spannable.getSpanStart(chips[i]));
-            chips[i].storeChipEnd(spannable.getSpanEnd(chips[i]));
-            spannable.removeSpan(chips[i]);
+            recipients[i].storeChipStart(spannable.getSpanStart(recipients[i]));
+            recipients[i].storeChipEnd(spannable.getSpanEnd(recipients[i]));
+            spannable.removeSpan(recipients[i]);
         }
         SpannableString chipText = new SpannableString(text.subSequence(totalReplaceStart,
                 totalReplaceEnd));
@@ -1216,10 +1216,19 @@
         }
     }
 
+    /**
+     * Get whether there are any recipients pending addition to the view.
+     * If there are, don't do anything in the text watcher.
+     * @return
+     */
+    private boolean chipsPending() {
+        return mPendingChipsCount > 0 || (mRemovedSpans != null && mRemovedSpans.size() > 0);
+    }
+
     private class RecipientTextWatcher implements TextWatcher {
         @Override
         public void afterTextChanged(Editable s) {
-            if (mPendingChipsCount > 0) {
+            if (chipsPending()) {
                 return;
             }
             if (mSelectedChip != null) {