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 862794 - Factor out the code for handling favicon loaders (r=bnicholson)

Browse Source
This commit is contained in:
Lucas Rocha 2013-06-25 17:51:57 +01:00
parent 03dbd51680
commit 40db803614
3 changed files with 125 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
mobile/android/base/BrowserSearch.java
View File

@ -11,6 +11,7 @@ import org.mozilla.gecko.db.BrowserDB.URLColumns;
import org.mozilla.gecko.gfx.BitmapUtils;
import org.mozilla.gecko.util.GeckoEventListener;
import org.mozilla.gecko.util.ThreadUtils;
import org.mozilla.gecko.home.FaviconsLoader;
import org.mozilla.gecko.home.HomeFragment;
import org.mozilla.gecko.home.HomeListView;
import org.mozilla.gecko.home.TwoLinePageRow;
@ -26,7 +27,6 @@ import android.content.Context;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.content.res.Configuration;
import android.support.v4.app.Fragment;
import android.support.v4.app.LoaderManager;
import android.support.v4.app.LoaderManager.LoaderCallbacks;
@ -64,9 +64,6 @@ public class BrowserSearch extends HomeFragment
// AsyncTask loader ID for suggestion query
private static final int SUGGESTION_LOADER_ID = 2;
// Argument containing list of urls for the favicons loader
private static final String FAVICONS_LOADER_URLS_ARG = "urls";
// Timeout for the suggestion client to respond
private static final int SUGGESTION_TIMEOUT = 3000;
@ -307,30 +304,6 @@ public class BrowserSearch extends HomeFragment
GeckoAppShell.getEventDispatcher().unregisterEventListener(eventName, this);
}
private ArrayList<String> getUrlsWithoutFavicon(Cursor c) {
ArrayList<String> urls = new ArrayList<String>();
if (c == null || !c.moveToFirst()) {
return urls;
}
final Favicons favicons = Favicons.getInstance();
do {
final String url = c.getString(c.getColumnIndexOrThrow(URLColumns.URL));
// We only want to load favicons from DB if they are not in the
// memory cache yet.
if (favicons.getFaviconFromMemCache(url) != null) {
continue;
}
urls.add(url);
} while (c.moveToNext());
return urls;
}
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
final Cursor c = mAdapter.getCursor();
@ -387,50 +360,6 @@ public class BrowserSearch extends HomeFragment
}
}
private static class FaviconsCursorLoader extends SimpleCursorLoader {
private ArrayList<String> mUrls;
public FaviconsCursorLoader(Context context, ArrayList<String> urls) {
super(context);
mUrls = urls;
}
@Override
public Cursor loadCursor() {
final ContentResolver cr = getContext().getContentResolver();
Cursor c = BrowserDB.getFaviconsForUrls(cr, mUrls);
storeFaviconsInMemCache(c);
return c;
}
private void storeFaviconsInMemCache(Cursor c) {
if (c == null || !c.moveToFirst()) {
return;
}
final Favicons favicons = Favicons.getInstance();
do {
final String url = c.getString(c.getColumnIndexOrThrow(Combined.URL));
final byte[] b = c.getBlob(c.getColumnIndexOrThrow(Combined.FAVICON));
if (b == null || b.length == 0) {
continue;
}
Bitmap favicon = BitmapUtils.decodeByteArray(b);
if (favicon == null) {
continue;
}
favicon = favicons.scaleImage(favicon);
favicons.putFaviconInMemCache(url, favicon);
} while (c.moveToNext());
}
}
private static class SuggestionAsyncLoader extends AsyncTaskLoader<ArrayList<String>> {
private final SuggestClient mSuggestClient;
private final String mSearchTerm;
@ -618,8 +547,7 @@ public class BrowserSearch extends HomeFragment
return new SearchCursorLoader(getActivity(), mSearchTerm);
case FAVICONS_LOADER_ID:
final ArrayList<String> urls = args.getStringArrayList(FAVICONS_LOADER_URLS_ARG);
return new FaviconsCursorLoader(getActivity(), urls);
return FaviconsLoader.createInstance(getActivity(), args);
}
return null;
@ -632,14 +560,8 @@ public class BrowserSearch extends HomeFragment
case SEARCH_LOADER_ID:
mAdapter.swapCursor(c);
// If there urls without in-memory favicons, trigger a new loader
// to load the images from disk to memory.
ArrayList<String> urls = getUrlsWithoutFavicon(c);
if (urls.size() > 0) {
Bundle args = new Bundle();
args.putStringArrayList(FAVICONS_LOADER_URLS_ARG, urls);
getLoaderManager().restartLoader(FAVICONS_LOADER_ID, args, mCursorLoaderCallbacks);
}
FaviconsLoader.restartFromCursor(getLoaderManager(), FAVICONS_LOADER_ID,
mCursorLoaderCallbacks, c);
break;
case FAVICONS_LOADER_ID:

1
mobile/android/base/Makefile.in
View File

@ -222,6 +222,7 @@ FENNEC_JAVA_FILES = \
home/HomePager.java \
home/HomePagerTabStrip.java \
home/FadedTextView.java \
home/FaviconsLoader.java \
home/TopBookmarkItemView.java \
home/TopBookmarksView.java \
home/TwoLinePageRow.java \

120
mobile/android/base/home/FaviconsLoader.java Normal file
View File

@ -0,0 +1,120 @@
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.home;
import org.mozilla.gecko.Favicons;
import org.mozilla.gecko.SimpleCursorLoader;
import org.mozilla.gecko.db.BrowserDB;
import org.mozilla.gecko.db.BrowserDB.URLColumns;
import org.mozilla.gecko.gfx.BitmapUtils;
import android.content.ContentResolver;
import android.content.Context;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.support.v4.app.LoaderManager;
import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.support.v4.content.Loader;
import java.util.ArrayList;
/**
* Encapsulates the implementation of the favicons cursorloader.
*/
public class FaviconsLoader {
// Argument containing list of urls for the favicons loader
private static final String FAVICONS_LOADER_URLS_ARG = "urls";
private FaviconsLoader() {
}
private static ArrayList<String> getUrlsWithoutFavicon(Cursor c) {
ArrayList<String> urls = new ArrayList<String>();
if (c == null || !c.moveToFirst()) {
return urls;
}
final Favicons favicons = Favicons.getInstance();
do {
final String url = c.getString(c.getColumnIndexOrThrow(URLColumns.URL));
// We only want to load favicons from DB if they are not in the
// memory cache yet.
if (favicons.getFaviconFromMemCache(url) != null) {
continue;
}
urls.add(url);
} while (c.moveToNext());
return urls;
}
private static void storeFaviconsInMemCache(Cursor c) {
if (c == null || !c.moveToFirst()) {
return;
}
final Favicons favicons = Favicons.getInstance();
do {
final String url = c.getString(c.getColumnIndexOrThrow(URLColumns.URL));
final byte[] b = c.getBlob(c.getColumnIndexOrThrow(URLColumns.FAVICON));
if (b == null || b.length == 0) {
continue;
}
Bitmap favicon = BitmapUtils.decodeByteArray(b);
if (favicon == null) {
continue;
}
favicon = favicons.scaleImage(favicon);
favicons.putFaviconInMemCache(url, favicon);
} while (c.moveToNext());
}
public static void restartFromCursor(LoaderManager manager, int loaderId,
LoaderCallbacks<Cursor> callbacks, Cursor c) {
// If there urls without in-memory favicons, trigger a new loader
// to load the images from disk to memory.
ArrayList<String> urls = getUrlsWithoutFavicon(c);
if (urls.size() > 0) {
Bundle args = new Bundle();
args.putStringArrayList(FAVICONS_LOADER_URLS_ARG, urls);
manager.restartLoader(loaderId, args, callbacks);
}
}
public static Loader<Cursor> createInstance(Context context, Bundle args) {
final ArrayList<String> urls = args.getStringArrayList(FAVICONS_LOADER_URLS_ARG);
return new FaviconsCursorLoader(context, urls);
}
private static class FaviconsCursorLoader extends SimpleCursorLoader {
private final ArrayList<String> mUrls;
public FaviconsCursorLoader(Context context, ArrayList<String> urls) {
super(context);
mUrls = urls;
}
@Override
public Cursor loadCursor() {
final ContentResolver cr = getContext().getContentResolver();
Cursor c = BrowserDB.getFaviconsForUrls(cr, mUrls);
storeFaviconsInMemCache(c);
return c;
}
}
}