bluetooth: Allow updates on chooser items.

chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ skipping 46 matching lines @@
          * without selecting anything.
          */
         void onItemSelected(String id);
     }
 
     /**
      * A class representing one data row in the picker.
      */
     public static class ItemChooserRow {
         private final String mKey;
-        private final String mDescription;
+        private String mDescription;
 
         public ItemChooserRow(String key, String description) {
             mKey = key;
             mDescription = description;
         }
 
         @Override
         public boolean equals(Object obj) {
             if (!(obj instanceof ItemChooserRow)) return false;
             if (this == obj) return true;
@@ skipping 63 matching lines @@
         // The zero-based index of the item currently selected in the dialog,
         // or -1 (INVALID_POSITION) if nothing is selected.
         private int mSelectedItem = ListView.INVALID_POSITION;
 
         // A set of keys that are marked as disabled in the dialog.
         private Set<String> mDisabledEntries = new HashSet<String>();
 
         // Item descriptions are counted in a map.
         private Map<String, Integer> mItemDescriptionMap = new HashMap<>();
 
+        // Map of keys to items so that we can access the items in O(1).
+        private Map<String, ItemChooserRow> mKeyToItemMap = new HashMap<>();
+
         public ItemAdapter(Context context, int resource) {
             super(context, resource);
 
             mInflater = LayoutInflater.from(context);
 
             mBackgroundHighlightColor = ApiCompatibilityUtils.getColor(getContext().getResources(),
                     R.color.light_active_color);
             mDefaultTextColor = ApiCompatibilityUtils.getColor(getContext().getResources(),
                     R.color.default_text_color);
         }
 
-        @Override
-        public void add(ItemChooserRow item) {
+        public void addOrUpdate(ItemChooserRow item) {
+            if (mKeyToItemMap.containsKey(item.mKey)) {
+                // TODO(ortuno): Update description.
+                // https://crbug.com/634366
+                return;
+            }
+            ItemChooserRow result = mKeyToItemMap.put(item.mKey, item);
+            assert result == null;
+
             String description = item.mDescription;
             int count = mItemDescriptionMap.containsKey(description)
                     ? mItemDescriptionMap.get(description) : 0;
             mItemDescriptionMap.put(description, count + 1);
-            super.add(item);
+            add(item);
         }
 
         @Override
         public void remove(ItemChooserRow item) {
+            mKeyToItemMap.remove(item.mKey);
             String description = item.mDescription;
             if (mItemDescriptionMap.containsKey(description)) {
                 int count = mItemDescriptionMap.get(description);
                 if (count == 1) {
                     mItemDescriptionMap.remove(description);
                 } else {
                     mItemDescriptionMap.put(description, count - 1);
                 }
             }
             super.remove(item);
         }
 
         @Override
         public void clear() {
             mSelectedItem = ListView.INVALID_POSITION;
+            mKeyToItemMap.clear();
             mDisabledEntries.clear();
             mItemDescriptionMap.clear();
             mConfirmButton.setEnabled(false);
             super.clear();
         }
 
         /**
          * Returns the key of the currently selected item or blank if nothing is
          * selected.
          */
@@ skipping 209 matching lines @@
         }
 
         mDialog.show();
     }
 
     public void dismiss() {
         mDialog.dismiss();
     }
 
     /**
-    * Add an item to the end of the list to show in the dialog.
+    * Add an item to the end of the list to show in the dialog if the item
+    * was not in the chooser. Otherwise update the items description.
     *
-    * @param item The item to be added to the end of the chooser.
+    * @param item The item to be added to the end of the chooser or updated.
     */
-    public void addItemToList(ItemChooserRow item) {
+    public void addOrUpdateItem(ItemChooserRow item) {
         mProgressBar.setVisibility(View.GONE);
-        mItemAdapter.add(item);
+        mItemAdapter.addOrUpdate(item);
         setState(State.PROGRESS_UPDATE_AVAILABLE);
     }
 
     /**
     * Remove an item that is shown in the dialog.
     *
     * @param item The item to be removed in the chooser.
     */
     public void removeItemFromList(ItemChooserRow item) {
         mItemAdapter.remove(item);
@@ skipping 68 matching lines @@
     }
 
     /**
      * Returns the ItemAdapter associated with this class. For use with tests only.
      */
     @VisibleForTesting
     public ItemAdapter getItemAdapterForTesting() {
         return mItemAdapter;
     }
 }