From 48dbb781270c2e290aa5c35d3635d84136084096 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Mon, 18 Jun 2012 12:39:13 -0700
Subject: [PATCH] Bug 759041 - Fix context menus in all pages. r=lucasr

---
 .../android/base/awesomebar/AllPagesTab.java  | 85 ++++++++++---------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/mobile/android/base/awesomebar/AllPagesTab.java b/mobile/android/base/awesomebar/AllPagesTab.java
index 044219b0fdd..aa6b3108052 100644
--- a/mobile/android/base/awesomebar/AllPagesTab.java
+++ b/mobile/android/base/awesomebar/AllPagesTab.java
@@ -54,6 +54,7 @@ import org.mozilla.gecko.db.BrowserContract.Combined;
 public class AllPagesTab extends AwesomeBarTab {
     public static final String LOGTAG = "ALL_PAGES";
     private static final String TAG = "allPages";
+    private String mSearchTerm;
     private SearchEngine mSuggestEngine;
     private ArrayList<SearchEngine> mSearchEngines;
     private ListView mView = null;
@@ -150,48 +151,50 @@ public class AllPagesTab extends AwesomeBarTab {
         public void onClick();
     }
 
-    private class AwesomeBarCursorAdapter extends SimpleCursorAdapter {
-        private String mSearchTerm;
+    private class AwesomeBarCursorItem implements AwesomeBarItem {
+        private Cursor mCursor;
 
+        public AwesomeBarCursorItem(Cursor cursor) {
+            mCursor = cursor;
+        }
+
+        public Cursor getCursor() {
+            return mCursor;
+        }
+
+        public void onClick() {
+            AwesomeBarTabs.OnUrlOpenListener listener = getUrlListener();
+            if (listener == null)
+                return;
+
+            String url = mCursor.getString(mCursor.getColumnIndexOrThrow(URLColumns.URL));
+
+            int display = mCursor.getInt(mCursor.getColumnIndexOrThrow(Combined.DISPLAY));
+            if (display == Combined.DISPLAY_READER) {
+                url = getReaderForUrl(url);
+            }
+            listener.onUrlOpen(url);
+        }
+    }
+
+    private class AwesomeBarSearchEngineItem implements AwesomeBarItem {
+        private String mSearchEngine;
+
+        public AwesomeBarSearchEngineItem(String searchEngine) {
+            mSearchEngine = searchEngine;
+        }
+
+        public void onClick() {
+            AwesomeBarTabs.OnUrlOpenListener listener = getUrlListener();
+            if (listener != null)
+                listener.onSearch(mSearchEngine, mSearchTerm);
+        }
+    }
+
+    private class AwesomeBarCursorAdapter extends SimpleCursorAdapter {
         private static final int ROW_SEARCH = 0;
         private static final int ROW_STANDARD = 1;
 
-        private class AwesomeBarCursorItem implements AwesomeBarItem {
-            private Cursor mCursor;
-
-            public AwesomeBarCursorItem(Cursor cursor) {
-                mCursor = cursor;
-            }
-
-            public void onClick() {
-                AwesomeBarTabs.OnUrlOpenListener listener = getUrlListener();
-                if (listener == null)
-                    return;
-
-                String url = mCursor.getString(mCursor.getColumnIndexOrThrow(URLColumns.URL));
-
-                int display = mCursor.getInt(mCursor.getColumnIndexOrThrow(Combined.DISPLAY));
-                if (display == Combined.DISPLAY_READER) {
-                    url = getReaderForUrl(url);
-                }
-                listener.onUrlOpen(url);
-            }
-        }
-
-        private class AwesomeBarSearchEngineItem implements AwesomeBarItem {
-            private String mSearchEngine;
-
-            public AwesomeBarSearchEngineItem(String searchEngine) {
-                mSearchEngine = searchEngine;
-            }
-
-            public void onClick() {
-                AwesomeBarTabs.OnUrlOpenListener listener = getUrlListener();
-                if (listener != null)
-                    listener.onSearch(mSearchEngine, mSearchTerm);
-            }
-        }
-
         public AwesomeBarCursorAdapter(Context context) {
             super(context, -1, null, new String[] {}, new int[] {});
             mSearchTerm = "";
@@ -519,12 +522,12 @@ public class AllPagesTab extends AwesomeBarTab {
         AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
         Object selectedItem = list.getItemAtPosition(info.position);
 
-        if (!(selectedItem instanceof Cursor)) {
-            Log.e(LOGTAG, "item at " + info.position + " is not a Cursor");
+        if (!(selectedItem instanceof AwesomeBarCursorItem)) {
+            Log.e(LOGTAG, "item at " + info.position + " is a search item");
             return subject;
         }
 
-        Cursor cursor = (Cursor) selectedItem;
+        Cursor cursor = ((AwesomeBarCursorItem) selectedItem).getCursor();
 
         // Don't show the context menu for folders
         String keyword = null;