r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Add accessors to get Chrome dev and beta bookmarks, also fix potential bugs

Browse Source
This commit is contained in:
Anthony Restaino 2016-02-06 22:06:24 -05:00
parent c4e5553785
commit 7f4cab1e2e
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/acr/browser/lightning/database/BookmarkLocalSync.java
View File

@ -56,7 +56,9 @@ public class BookmarkLocalSync {
if (title == null || title.isEmpty()) { if (title == null || title.isEmpty()) {
title = Utils.getDomainName(url); title = Utils.getDomainName(url);
} }
list.add(new HistoryItem(url, title)); if (title != null) {
list.add(new HistoryItem(url, title));
}
} }
} }
} }
@ -91,7 +93,9 @@ public class BookmarkLocalSync {
if (title == null || title.isEmpty()) { if (title == null || title.isEmpty()) {
title = Utils.getDomainName(url); title = Utils.getDomainName(url);
} }
list.add(new HistoryItem(url, title)); if (title != null) {
list.add(new HistoryItem(url, title));
}
} }
} }
} }
@ -113,7 +117,38 @@ public class BookmarkLocalSync {
public boolean isChromeSupported() { public boolean isChromeSupported() {
Cursor cursor = getChromeCursor(); Cursor cursor = getChromeCursor();
Utils.close(cursor); Utils.close(cursor);
return cursor != null; Cursor dev = getChromeDevCursor();
Utils.close(dev);
Cursor beta = getChromeBetaCursor();
return cursor != null || dev != null || beta != null;
}
@Nullable
@WorkerThread
private Cursor getChromeBetaCursor() {
Cursor cursor;
Uri uri = Uri.parse(CHROME_BETA_BOOKMARKS_CONTENT);
try {
cursor = mContext.getContentResolver().query(uri,
new String[]{COLUMN_URL, COLUMN_TITLE, COLUMN_BOOKMARK}, null, null, null);
} catch (IllegalArgumentException e) {
return null;
}
return cursor;
}
@Nullable
@WorkerThread
private Cursor getChromeDevCursor() {
Cursor cursor;
Uri uri = Uri.parse(CHROME_DEV_BOOKMARKS_CONTENT);
try {
cursor = mContext.getContentResolver().query(uri,
new String[]{COLUMN_URL, COLUMN_TITLE, COLUMN_BOOKMARK}, null, null, null);
} catch (IllegalArgumentException e) {
return null;
}
return cursor;
} }
@Nullable @Nullable
@ -144,7 +179,7 @@ public class BookmarkLocalSync {
return cursor; return cursor;
} }
public void printAllColumns(){ public void printAllColumns() {
printColumns(CHROME_BETA_BOOKMARKS_CONTENT); printColumns(CHROME_BETA_BOOKMARKS_CONTENT);
printColumns(CHROME_BOOKMARKS_CONTENT); printColumns(CHROME_BOOKMARKS_CONTENT);
printColumns(CHROME_DEV_BOOKMARKS_CONTENT); printColumns(CHROME_DEV_BOOKMARKS_CONTENT);