commit 60e333622004cdcab73ceaacdd932fc05f8d6c77
author John Reck <jreck@google.com> Thu Dec 02 17:52:38 2010 -0800
committer John Reck <jreck@google.com> Thu Dec 02 18:07:26 2010 -0800
tree da2b2080f86d543b99c1253542eb8691c441d182
parent eff89529627530aef9f7760d8793934ee862470a

Fix context menu for bookmarks

 Bug: 3249288
 Fixed a bug where the code to lookup the count of the items in a folder
 was being executed for bookmarks as well as folders, causing the URL
 line to be replaced with "Empty Folder" in the context menu.

Change-Id: I35ac071952da4093bac8bc104636dd8fcb8b84b1

src/com/android/browser/BrowserBookmarksPage.java

diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 4887f3f..74385f9 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -357,8 +357,6 @@
         }
         BookmarkItem header = new BookmarkItem(activity);
         populateBookmarkItem(cursor, header, isFolder);
-        new LookupBookmarkCount(getActivity(), header)
-                .execute(cursor.getLong(BookmarksLoader.COLUMN_INDEX_ID));
         menu.setHeaderView(header);
 
         int count = menu.size();
@@ -374,6 +372,8 @@
             Bitmap bitmap =
                 BitmapFactory.decodeResource(getResources(), R.drawable.ic_folder);
             item.setFavicon(bitmap);
+            new LookupBookmarkCount(getActivity(), item)
+                    .execute(cursor.getLong(BookmarksLoader.COLUMN_INDEX_ID));
         } else {
             String url = cursor.getString(BookmarksLoader.COLUMN_INDEX_URL);
             item.setUrl(url);