corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1127445 - Add functionality to reading list button in the toolbar menu. r=margaret

Browse Source 
This functionality includes adding and removing items from the reading list.
This patch largely mimics the code of the already-functional bookmarks menu
item.

Note: the reader mode "add to reading list" button has inconsistent behavior
with the "add to reading list" button just added. I believe this is because
LocalReadingListAccessor distinguishes between reader and non-reader urls while
the JS implmentation does not.
This commit is contained in:
Michael Comella
2015-03-06 16:56:11 -08:00
parent a573bcb0bc
commit 1c900cd957
3 changed files with 135 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mobile/android/base/Tabs.java
View File

@@ -67,7 +67,8 @@ public class Tabs implements GeckoEventListener {
private volatile boolean mInitialTabsAdded;
private Context mAppContext;
private ContentObserver mContentObserver;
private ContentObserver mBookmarksContentObserver;
private ContentObserver mReadingListContentObserver;
private PersistTabsRunnable mPersistTabsRunnable;
private static class PersistTabsRunnable implements Runnable {
@@ -140,11 +141,19 @@ public class Tabs implements GeckoEventListener {
// The listener will run on the background thread (see 2nd argument).
mAccountManager.addOnAccountsUpdatedListener(mAccountListener, ThreadUtils.getBackgroundHandler(), false);
if (mContentObserver != null) {
if (mBookmarksContentObserver != null) {
// It's safe to use the db here since we aren't doing any I/O.
final GeckoProfile profile = GeckoProfile.get(context);
profile.getDB().registerBookmarkObserver(getContentResolver(), mContentObserver);
profile.getDB().registerBookmarkObserver(getContentResolver(), mBookmarksContentObserver);
}
if (mReadingListContentObserver != null) {
// It's safe to use the db here since we aren't doing any I/O.
final GeckoProfile profile = GeckoProfile.get(context);
profile.getDB().getReadingListAccessor().registerContentObserver(
mAppContext, mReadingListContentObserver);
}
}
/**
@@ -179,10 +188,10 @@ public class Tabs implements GeckoEventListener {
return -1;
}
// Must be synchronized to avoid racing on mContentObserver.
// Must be synchronized to avoid racing on mBookmarksContentObserver.
private void lazyRegisterBookmarkObserver() {
if (mContentObserver == null) {
mContentObserver = new ContentObserver(null) {
if (mBookmarksContentObserver == null) {
mBookmarksContentObserver = new ContentObserver(null) {
@Override
public void onChange(boolean selfChange) {
for (Tab tab : mOrder) {
@@ -193,7 +202,26 @@ public class Tabs implements GeckoEventListener {
// It's safe to use the db here since we aren't doing any I/O.
final GeckoProfile profile = GeckoProfile.get(mAppContext);
profile.getDB().registerBookmarkObserver(getContentResolver(), mContentObserver);
profile.getDB().registerBookmarkObserver(getContentResolver(), mBookmarksContentObserver);
}
}
// Must be synchronized to avoid racing on mReadingListContentObserver.
private void lazyRegisterReadingListObserver() {
if (mReadingListContentObserver == null) {
mReadingListContentObserver = new ContentObserver(null) {
@Override
public void onChange(final boolean selfChange) {
for (final Tab tab : mOrder) {
tab.updateReadingList();
}
}
};
// It's safe to use the db here since we aren't doing any I/O.
final GeckoProfile profile = GeckoProfile.get(mAppContext);
profile.getDB().getReadingListAccessor().registerContentObserver(
mAppContext, mReadingListContentObserver);
}
}
@@ -202,6 +230,7 @@ public class Tabs implements GeckoEventListener {
new Tab(mAppContext, id, url, external, parentId, title);
synchronized (this) {
lazyRegisterBookmarkObserver();
lazyRegisterReadingListObserver();
mTabs.put(id, tab);
if (tabIndex > -1) {