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 697528 - Remove incorrect entries from awesome bar

Browse Source 
Don't show bookmark items that have not been visited in the "History" section
of the awesome bar. This is done by adding a date check on the SQL query for
the history items.

Also, when the history is empty, a dummy "Bookmarks" item with no URL appears
in the Bookmarks database. Prevent this entry from showing up in the Awesomebar
UI by filtering out rows with a zero-length URL.
This commit is contained in:
Kartikaya Gupta 2011-10-27 09:51:25 -04:00
parent 7436980605
commit 0b06cd8efd
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
embedding/android/AwesomeBarTabs.java
View File

@ -155,7 +155,11 @@ public class AwesomeBarTabs extends TabHost {
return resolver.query(Browser.BOOKMARKS_URI,
null,
Browser.BookmarkColumns.BOOKMARK + " = 1",
// Select all bookmarks with a non-empty URL. When the history
// is empty there appears to be a dummy entry in the database
// which has a title of "Bookmarks" and no URL; the length restriction
// is to avoid picking that up specifically.
Browser.BookmarkColumns.BOOKMARK + " = 1 AND LENGTH(" + Browser.BookmarkColumns.URL + ") > 0",
null,
Browser.BookmarkColumns.TITLE);
}
@ -199,7 +203,9 @@ public class AwesomeBarTabs extends TabHost {
return resolver.query(Browser.BOOKMARKS_URI,
null,
null,
// Bookmarks that have not been visited have a date value
// of 0, so don't pick them up in the history view.
Browser.BookmarkColumns.DATE + " > 0",
null,
Browser.BookmarkColumns.DATE + " DESC");
}
@ -429,7 +435,11 @@ public class AwesomeBarTabs extends TabHost {
ContentResolver resolver = mContext.getContentResolver();
return resolver.query(Browser.BOOKMARKS_URI,
null, Browser.BookmarkColumns.URL + " LIKE ? OR title LIKE ?",
null,
// The length restriction on URL is for the same reason as in the general bookmark query
// (see comment earlier in this file).
"(" + Browser.BookmarkColumns.URL + " LIKE ? OR " + Browser.BookmarkColumns.TITLE + " LIKE ?)"
+ " AND LENGTH(" + Browser.BookmarkColumns.URL + ") > 0",
new String[] {"%" + constraint.toString() + "%", "%" + constraint.toString() + "%",},
// ORDER BY is number of visits times a multiplier from 1 - 120 of how recently the site
// was accessed with a site accessed today getting 120 and a site accessed 119 or more