Bug 726379 - Remove CheckBookmarkTask, use a simple Runnable. r=sriram a=blocking-fennec

This commit is contained in:
Gian-Carlo Pascutto 2012-04-19 16:41:53 +02:00
parent 7b375732f4
commit 6a3028b06f

View File

@ -82,7 +82,6 @@ public final class Tab {
private boolean mBookmark;
private HashMap<String, DoorHanger> mDoorHangers;
private long mFaviconLoadId;
private CheckBookmarkTask mCheckBookmarkTask;
private String mDocumentURI;
private String mContentType;
private boolean mHasTouchListeners;
@ -373,17 +372,16 @@ public final class Tab {
}
private void updateBookmark() {
GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
final String url = getURL();
if (url == null)
return;
GeckoBackgroundThread.getHandler().post(new Runnable() {
public void run() {
if (mCheckBookmarkTask != null)
mCheckBookmarkTask.cancel(false);
String url = getURL();
if (url == null)
return;
mCheckBookmarkTask = new CheckBookmarkTask(url);
mCheckBookmarkTask.execute();
boolean bookmark = BrowserDB.isBookmark(mContentResolver, url);
if (url.equals(getURL())) {
mBookmark = bookmark;
}
}
});
}
@ -524,40 +522,6 @@ public final class Tab {
}
}
private final class CheckBookmarkTask extends AsyncTask<Void, Void, Boolean> {
private final String mUrl;
public CheckBookmarkTask(String url) {
mUrl = url;
}
@Override
protected Boolean doInBackground(Void... unused) {
return BrowserDB.isBookmark(mContentResolver, mUrl);
}
@Override
protected void onCancelled() {
mCheckBookmarkTask = null;
}
@Override
protected void onPostExecute(final Boolean isBookmark) {
mCheckBookmarkTask = null;
GeckoApp.mAppContext.runOnUiThread(new Runnable() {
public void run() {
// Ignore this task if it's not about the current
// tab URL anymore.
if (!mUrl.equals(getURL()))
return;
mBookmark = isBookmark.booleanValue();
}
});
}
}
private void saveThumbnailToDB(BitmapDrawable thumbnail) {
try {
String url = getURL();