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 737896 - Put desktop bookmark folders under a "Desktop Bookmarks" folder. r=lucasr

Browse Source
This commit is contained in:
Margaret Leibovic 2012-04-02 11:56:53 -07:00
parent 00c241d2bd
commit 3516f3f317
3 changed files with 83 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/base/AwesomeBarTabs.java
View File

@ -255,8 +255,8 @@ public class AwesomeBarTabs extends TabHost {
return c.getString(c.getColumnIndexOrThrow(Bookmarks.TITLE));
// Use localized strings for special folder names.
if (guid.equals(Bookmarks.MOBILE_FOLDER_GUID))
return mResources.getString(R.string.bookmarks_folder_mobile);
if (guid.equals(Bookmarks.FAKE_DESKTOP_FOLDER_GUID))
return mResources.getString(R.string.bookmarks_folder_desktop);
else if (guid.equals(Bookmarks.MENU_FOLDER_GUID))
return mResources.getString(R.string.bookmarks_folder_menu);
else if (guid.equals(Bookmarks.TOOLBAR_FOLDER_GUID))

2
mobile/android/base/db/BrowserContract.java.in
View File

@ -105,6 +105,7 @@ public class BrowserContract {
private Bookmarks() {}
public static final int FIXED_ROOT_ID = 0;
public static final int FAKE_DESKTOP_FOLDER_ID = -1;
public static final String MOBILE_FOLDER_GUID = "mobile";
public static final String PLACES_FOLDER_GUID = "places";
@ -112,6 +113,7 @@ public class BrowserContract {
public static final String TAGS_FOLDER_GUID = "tags";
public static final String TOOLBAR_FOLDER_GUID = "toolbar";
public static final String UNFILED_FOLDER_GUID = "unfiled";
public static final String FAKE_DESKTOP_FOLDER_GUID = "desktop";
public static final int TYPE_FOLDER = 0;
public static final int TYPE_BOOKMARK = 1;

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

@ -352,31 +352,28 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
cr.delete(mHistoryUriWithProfile, null, null);
}
// This method filters out the root folder and the tags folder, since we
// don't want to see those in the UI
public Cursor getBookmarksInFolder(ContentResolver cr, long folderId) {
Cursor c = null;
boolean addDesktopFolder = false;
// If there are no desktop bookmarks, use the mobile bookmarks folder
// for the root folder view
if (folderId == Bookmarks.FIXED_ROOT_ID && !desktopBookmarksExist(cr))
// We always want to show mobile bookmarks in the root view.
if (folderId == Bookmarks.FIXED_ROOT_ID) {
folderId = getMobileBookmarksFolderId(cr);
if (folderId == Bookmarks.FIXED_ROOT_ID) {
// Because of sync, we can end up with some additional records under
// the root node that we don't want to see. Since sync doesn't
// want to run into problems deleting these, we can just ignore them
// by querying specifically for only the folders we care about.
// We'll add a fake "Desktop Bookmarks" folder to the root view if desktop
// bookmarks exist, so that the user can still access non-mobile bookmarks.
addDesktopFolder = desktopBookmarksExist(cr);
}
if (folderId == Bookmarks.FAKE_DESKTOP_FOLDER_ID) {
// Since the "Desktop Bookmarks" folder doesn't actually exist, we
// just fake it by querying specifically certain known desktop folders.
c = cr.query(mBookmarksUriWithProfile,
DEFAULT_BOOKMARK_COLUMNS,
Bookmarks.PARENT + " = ? AND (" +
Bookmarks.GUID + " = ? OR " +
Bookmarks.GUID + " = ? OR " +
Bookmarks.GUID + " = ? OR " +
Bookmarks.GUID + " = ?)",
new String[] { String.valueOf(folderId),
Bookmarks.MOBILE_FOLDER_GUID,
Bookmarks.TOOLBAR_FOLDER_GUID,
Bookmarks.GUID + " = ?",
new String[] { Bookmarks.TOOLBAR_FOLDER_GUID,
Bookmarks.MENU_FOLDER_GUID,
Bookmarks.UNFILED_FOLDER_GUID },
null);
@ -393,6 +390,11 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
null);
}
if (addDesktopFolder) {
// Wrap cursor to add fake desktop bookmarks folder
c = new DesktopBookmarksCursorWrapper(c);
}
return new LocalDBCursor(c);
}
@ -664,6 +666,67 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
return b;
}
// This wrapper adds a fake "Desktop Bookmarks" folder entry to the
// beginning of the cursor's data set.
private static class DesktopBookmarksCursorWrapper extends CursorWrapper {
private boolean mAtDesktopBookmarksPosition = false;
public DesktopBookmarksCursorWrapper(Cursor c) {
super(c);
}
@Override
public int getCount() {
return super.getCount() + 1;
}
@Override
public boolean moveToPosition(int position) {
if (position == 0) {
mAtDesktopBookmarksPosition = true;
return true;
}
mAtDesktopBookmarksPosition = false;
return super.moveToPosition(position - 1);
}
@Override
public long getLong(int columnIndex) {
if (!mAtDesktopBookmarksPosition)
return super.getLong(columnIndex);
if (columnIndex == getColumnIndex(Bookmarks._ID))
return Bookmarks.FAKE_DESKTOP_FOLDER_ID;
if (columnIndex == getColumnIndex(Bookmarks.PARENT))
return Bookmarks.FIXED_ROOT_ID;
return -1;
}
@Override
public int getInt(int columnIndex) {
if (!mAtDesktopBookmarksPosition)
return super.getInt(columnIndex);
if (columnIndex == getColumnIndex(Bookmarks.TYPE))
return Bookmarks.TYPE_FOLDER;
return -1;
}
@Override
public String getString(int columnIndex) {
if (!mAtDesktopBookmarksPosition)
return super.getString(columnIndex);
if (columnIndex == getColumnIndex(Bookmarks.GUID))
return Bookmarks.FAKE_DESKTOP_FOLDER_GUID;
return "";
}
}
private static class LocalDBCursor extends CursorWrapper {
public LocalDBCursor(Cursor c) {
super(c);