wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 783312 - Use pinned sites backend to return a cursor with pinned+top sites. r=mfinkle

Browse Source
This commit is contained in:
Wes Johnston 2012-12-28 13:46:06 -08:00
parent c9caf55e2f
commit 64547a136d
3 changed files with 169 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
mobile/android/base/AboutHomeContent.java
View File

@ -6,6 +6,7 @@
package org.mozilla.gecko;
import org.mozilla.gecko.db.BrowserContract.Thumbnails;
import org.mozilla.gecko.db.BrowserContract.Bookmarks;
import org.mozilla.gecko.db.BrowserDB;
import org.mozilla.gecko.db.BrowserDB.URLColumns;
import org.mozilla.gecko.sync.setup.SyncAccounts;
@ -40,9 +41,11 @@ import android.text.TextUtils;
import android.text.style.StyleSpan;
import android.util.AttributeSet;
import android.util.Log;
import android.util.SparseArray;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AbsListView;
import android.widget.GridView;
@ -88,7 +91,6 @@ public class AboutHomeContent extends ScrollView
private Context mContext;
private BrowserApp mActivity;
private Cursor mCursor;
UriLoadCallback mUriLoadCallback = null;
VoidCallback mLoadCompleteCallback = null;
private LayoutInflater mInflater;
@ -96,7 +98,7 @@ public class AboutHomeContent extends ScrollView
private AccountManager mAccountManager;
private OnAccountsUpdateListener mAccountListener = null;
protected SimpleCursorAdapter mTopSitesAdapter;
protected TopSitesCursorAdapter mTopSitesAdapter;
protected TopSitesGridView mTopSitesGrid;
private AboutHomePromoBox mPromoBox;
@ -118,6 +120,7 @@ public class AboutHomeContent extends ScrollView
public AboutHomeContent(Context context) {
super(context);
mContext = context;
mActivity = (BrowserApp) context;
}
public AboutHomeContent(Context context, AttributeSet attrs) {
@ -156,10 +159,8 @@ public class AboutHomeContent extends ScrollView
mTopSitesGrid = (TopSitesGridView)findViewById(R.id.top_sites_grid);
mTopSitesGrid.setOnItemClickListener(new AdapterView.OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
Cursor c = (Cursor) parent.getItemAtPosition(position);
String spec = c.getString(c.getColumnIndex(URLColumns.URL));
Log.i(LOGTAG, "clicked: " + spec);
TopSitesViewHolder holder = (TopSitesViewHolder) v.getTag();
String spec = holder.url;
if (mUriLoadCallback != null)
mUriLoadCallback.callback(spec);
@ -205,8 +206,10 @@ public class AboutHomeContent extends ScrollView
mAccountListener = null;
}
if (mCursor != null && !mCursor.isClosed())
mCursor.close();
Cursor cursor = mTopSitesAdapter.getCursor();
if (cursor != null && !cursor.isClosed())
cursor.close();
}
void setLastTabsVisibility(boolean visible) {
@ -255,23 +258,26 @@ public class AboutHomeContent extends ScrollView
final boolean syncIsSetup = SyncAccounts.syncAccountsExist(mActivity);
final ContentResolver resolver = mActivity.getContentResolver();
final Cursor oldCursor = mCursor;
Cursor old = null;
if (mTopSitesAdapter != null) {
old = mTopSitesAdapter.getCursor();
}
// Swap in the new cursor.
mCursor = BrowserDB.getTopSites(resolver, mNumberOfTopSites);
final Cursor oldCursor = old;
final Cursor newCursor = BrowserDB.getTopSites(resolver, mNumberOfTopSites);
post(new Runnable() {
public void run() {
if (mTopSitesAdapter == null) {
mTopSitesAdapter = new TopSitesCursorAdapter(mActivity,
R.layout.abouthome_topsite_item,
mCursor,
newCursor,
new String[] { URLColumns.TITLE },
new int[] { R.id.title });
mTopSitesAdapter.setViewBinder(new TopSitesViewBinder());
mTopSitesGrid.setAdapter(mTopSitesAdapter);
} else {
mTopSitesAdapter.changeCursor(mCursor);
mTopSitesAdapter.changeCursor(newCursor);
}
if (mTopSitesAdapter.getCount() > 0)
@ -334,12 +340,11 @@ public class AboutHomeContent extends ScrollView
if (view == null)
continue;
Cursor c = (Cursor) mTopSitesAdapter.getItem(i);
final String url = c.getString(c.getColumnIndex(URLColumns.URL));
TopSitesViewHolder holder = (TopSitesViewHolder)view.getTag();
final String url = holder.url;
if (TextUtils.isEmpty(url)) {
ImageView thumbnailView = (ImageView) view.findViewById(R.id.thumbnail);
thumbnailView.setImageResource(R.drawable.abouthome_thumbnail_add);
thumbnailView.setScaleType(ImageView.ScaleType.FIT_CENTER);
holder.thumbnailView.setImageResource(R.drawable.abouthome_thumbnail_add);
holder.thumbnailView.setScaleType(ImageView.ScaleType.FIT_CENTER);
} else {
displayThumbnail(view, thumbnails.get(url));
}
@ -348,7 +353,7 @@ public class AboutHomeContent extends ScrollView
mTopSitesGrid.invalidate();
}
public Map<String, Bitmap> getTopSitesThumbnails(Cursor c) {
public Map<String, Bitmap> getThumbnailsFromCursor(Cursor c) {
Map<String, Bitmap> thumbnails = new HashMap<String, Bitmap>();
try {
@ -388,7 +393,7 @@ public class AboutHomeContent extends ScrollView
@Override
public void onPostExecute(Cursor c) {
updateTopSitesThumbnails(getTopSitesThumbnails(c));
updateTopSitesThumbnails(getThumbnailsFromCursor(c));
}
}).execute();
}
@ -772,6 +777,12 @@ public class AboutHomeContent extends ScrollView
}
}
private class TopSitesViewHolder {
public TextView titleView = null;
public ImageView thumbnailView = null;
public String url = null;
}
public class TopSitesCursorAdapter extends SimpleCursorAdapter {
public TopSitesCursorAdapter(Context context, int layout, Cursor c,
String[] from, int[] to) {
@ -790,44 +801,42 @@ public class AboutHomeContent extends ScrollView
return;
}
@Override
public void bindView(View view, Context context, Cursor cursor) {
super.bindView(view, context, cursor);
view.setLayoutParams(new AbsListView.LayoutParams(mTopSitesGrid.getColumnWidth(),
Math.round(mTopSitesGrid.getColumnWidth()*ThumbnailHelper.THUMBNAIL_ASPECT_RATIO)));
}
}
private View buildView(String url, String title, View convertView) {
TopSitesViewHolder viewHolder;
if (convertView == null) {
convertView = mInflater.inflate(R.layout.abouthome_topsite_item, null);
class TopSitesViewBinder implements SimpleCursorAdapter.ViewBinder {
private boolean updateTitle(View view, Cursor cursor, int titleIndex) {
String title = cursor.getString(titleIndex);
TextView titleView = (TextView) view;
// Use the URL instead of an empty title for consistency with the normal URL
// bar view - this is the equivalent of getDisplayTitle() in Tab.java
if (title == null || title.length() == 0) {
int urlIndex = cursor.getColumnIndexOrThrow(URLColumns.URL);
title = cursor.getString(urlIndex);
}
titleView.setText(title);
if (TextUtils.isEmpty(title)) {
titleView.setVisibility(View.GONE);
viewHolder = new TopSitesViewHolder();
viewHolder.titleView = (TextView) convertView.findViewById(R.id.title);
viewHolder.thumbnailView = (ImageView) convertView.findViewById(R.id.thumbnail);
convertView.setTag(viewHolder);
} else {
titleView.setVisibility(View.VISIBLE);
viewHolder = (TopSitesViewHolder) convertView.getTag();
}
return true;
viewHolder.titleView.setVisibility(TextUtils.isEmpty(title) ? View.INVISIBLE : View.VISIBLE);
viewHolder.titleView.setText(title);
viewHolder.url = url;
// Force the view to fit inside this slot in the grid
convertView.setLayoutParams(new AbsListView.LayoutParams(mTopSitesGrid.getColumnWidth(),
Math.round(mTopSitesGrid.getColumnWidth()*ThumbnailHelper.THUMBNAIL_ASPECT_RATIO)));
return convertView;
}
@Override
public boolean setViewValue(View view, Cursor cursor, int columnIndex) {
int titleIndex = cursor.getColumnIndexOrThrow(URLColumns.TITLE);
if (columnIndex == titleIndex) {
return updateTitle(view, cursor, titleIndex);
}
public View getView(int position, View convertView, ViewGroup parent) {
String url = "";
String title = "";
// Other columns are handled automatically
return false;
Cursor c = getCursor();
c.moveToPosition(position);
if (!c.isAfterLast()) {
url = c.getString(c.getColumnIndex(URLColumns.URL));
title = c.getString(c.getColumnIndex(URLColumns.TITLE));
}
return buildView(url, title, convertView);
}
}
}

108
mobile/android/base/db/BrowserDB.java
View File

@ -6,6 +6,7 @@
package org.mozilla.gecko.db;
import org.mozilla.gecko.db.BrowserContract.ExpirePriority;
import org.mozilla.gecko.db.BrowserContract.Bookmarks;
import android.content.ContentResolver;
import android.database.ContentObserver;
@ -13,6 +14,7 @@ import android.database.Cursor;
import android.database.CursorWrapper;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.util.SparseArray;
import java.util.List;
@ -36,6 +38,8 @@ public class BrowserDB {
public Cursor filter(ContentResolver cr, CharSequence constraint, int limit);
// This should onlyl return frecent sites, BrowserDB.getTopSites will do the
// work to combine that list with the pinned sites list
public Cursor getTopSites(ContentResolver cr, int limit);
public void updateVisitedHistory(ContentResolver cr, String uri);
@ -124,7 +128,11 @@ public class BrowserDB {
}
public static Cursor getTopSites(ContentResolver cr, int limit) {
return new TopSitesCursorWrapper(sDb.getTopSites(cr, limit), limit);
// Note this is not a single query anymore, but actually returns a mixture of two queries, one for topSites
// and one for pinned sites
Cursor topSites = sDb.getTopSites(cr, limit);
Cursor pinnedSites = sDb.getPinnedSites(cr, limit);
return new TopSitesCursorWrapper(pinnedSites, topSites, limit);
}
public static void updateVisitedHistory(ContentResolver cr, String uri) {
@ -269,21 +277,73 @@ public class BrowserDB {
return sDb.getPinnedSites(cr, limit);
}
private static class PinnedSite {
public String title = "";
public String url = "";
public PinnedSite(String aTitle, String aUrl) {
title = aTitle;
url = aUrl;
}
}
/* Cursor wrapper that forces top sites to contain at least
* mNumberOfTopSites entries. For rows outside the wrapped cursor
* will return empty strings and zero.
*/
static public class TopSitesCursorWrapper extends CursorWrapper {
int mIndex = -1;
public static class TopSitesCursorWrapper extends CursorWrapper {
int mIndex = -1; // Current position of the cursor
Cursor mCursor = null;
int mSize = 0;
public TopSitesCursorWrapper(Cursor cursor, int size) {
super(cursor);
mCursor = cursor;
private SparseArray<PinnedSite> mPinnedSites = null;
public TopSitesCursorWrapper(Cursor pinnedCursor, Cursor normalCursor, int size) {
super(normalCursor);
setPinnedSites(pinnedCursor);
mCursor = normalCursor;
mSize = size;
}
public void setPinnedSites(Cursor c) {
mPinnedSites = new SparseArray<PinnedSite>();
if (c != null && c.getCount() > 0) {
c.moveToPosition(0);
do {
int pos = c.getInt(c.getColumnIndex(Bookmarks.POSITION));
String url = c.getString(c.getColumnIndex(URLColumns.URL));
String title = c.getString(c.getColumnIndex(URLColumns.TITLE));
mPinnedSites.put(pos, new PinnedSite(title, url));
} while (c.moveToNext());
}
}
public boolean hasPinnedSites() {
return mPinnedSites != null && mPinnedSites.size() > 0;
}
public PinnedSite getPinnedSite(int position) {
if (!hasPinnedSites()) {
return null;
}
return mPinnedSites.get(position);
}
private int getPinnedBefore(int position) {
int numFound = 0;
if (!hasPinnedSites()) {
return numFound;
}
for (int i = 0; i < position; i++) {
if (mPinnedSites.get(i) != null) {
numFound++;
}
}
return numFound;
}
public int getPosition() { return mIndex; }
public int getCount() { return mSize; }
public boolean isAfterLast() { return mIndex >= mSize; }
@ -294,19 +354,45 @@ public class BrowserDB {
public boolean moveToPosition(int position) {
mIndex = position;
if (position > -1 && position < mCursor.getCount())
super.moveToPosition(position);
// move the real cursor as if we were stepping through it to this position
// be careful not to move it to far, and to account for any pinned sites
int before = getPinnedBefore(position);
int p2 = position - before;
if (p2 >= -1 && p2 <= mCursor.getCount()) {
super.moveToPosition(p2);
}
return !(isBeforeFirst() || isAfterLast());
}
public long getLong(int columnIndex) {
if (mIndex > -1 && mIndex < mCursor.getCount())
if (hasPinnedSites()) {
PinnedSite site = getPinnedSite(mIndex);
if (site != null) {
return 0;
}
}
if (!super.isBeforeFirst() && !super.isAfterLast())
return super.getLong(columnIndex);
return 0;
}
public String getString(int columnIndex) {
if (mIndex > -1 && mIndex < mCursor.getCount())
if (hasPinnedSites()) {
PinnedSite site = getPinnedSite(mIndex);
if (site != null) {
if (columnIndex == mCursor.getColumnIndex(URLColumns.URL)) {
return site.url;
} else if (columnIndex == mCursor.getColumnIndex(URLColumns.TITLE)) {
return site.title;
}
return "";
}
}
if (!super.isBeforeFirst() && !super.isAfterLast())
return super.getString(columnIndex);
return "";
}

15
mobile/android/base/db/LocalBrowserDB.java
View File

@ -141,9 +141,11 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
private Cursor filterAllSites(ContentResolver cr, String[] projection, CharSequence constraint,
int limit, CharSequence urlFilter) {
String selection = "";
String[] selectionArgs = null;
return filterAllSites(cr, projection, constraint, limit, urlFilter, "", null);
}
private Cursor filterAllSites(ContentResolver cr, String[] projection, CharSequence constraint,
int limit, CharSequence urlFilter, String selection, String[] selectionArgs) {
// The combined history/bookmarks selection queries for sites with a url or title containing
// the constraint string(s), treating space-separated words as separate constraints
if (!TextUtils.isEmpty(constraint)) {
@ -224,13 +226,20 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
}
public Cursor getTopSites(ContentResolver cr, int limit) {
// Filter out sites that are pinned
String selection = DBUtils.concatenateWhere("", Combined.URL + " NOT IN (SELECT " +
Bookmarks.URL + " FROM bookmarks WHERE bookmarks." +
Bookmarks.PARENT + " == ?)");
String[] selectionArgs = DBUtils.appendSelectionArgs(new String[0], new String[] { String.valueOf(Bookmarks.FIXED_PINNED_LIST_ID) });
return filterAllSites(cr,
new String[] { Combined._ID,
Combined.URL,
Combined.TITLE },
"",
limit,
BrowserDB.ABOUT_PAGES_URL_FILTER);
BrowserDB.ABOUT_PAGES_URL_FILTER,
selection,
selectionArgs);
}
public void updateVisitedHistory(ContentResolver cr, String uri) {