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

Fix favicon retrieval from cache, disable preemptive favicon fetching

Browse Source
This commit is contained in:
anthony restaino 2017-06-05 21:12:17 -04:00
parent 6061db0b14
commit fbb820faf6
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/acr/browser/lightning/favicon/FaviconModel.java
View File

@ -136,14 +136,15 @@ public class FaviconModel {
File faviconCacheFile = createFaviconCacheFile(mApplication, uri);
Bitmap favicon = getFaviconFromMemCache(url);
if (faviconCacheFile.exists() && favicon != null) {
if (faviconCacheFile.exists() && favicon == null) {
favicon = mImageFetcher.retrieveFaviconFromCache(faviconCacheFile);
}
if (favicon == null) {
favicon = mImageFetcher.retrieveBitmapFromDomain(uri);
// favicon = mImageFetcher.retrieveBitmapFromDomain(uri);
} else {
Bitmap newFavicon = Utils.padFavicon(favicon);
@ -153,18 +154,18 @@ public class FaviconModel {
return;
}
if (favicon == null && allowGoogleService) {
favicon = mImageFetcher.retrieveBitmapFromGoogle(uri);
}
// if (favicon == null && allowGoogleService) {
// favicon = mImageFetcher.retrieveBitmapFromGoogle(uri);
// }
if (favicon != null) {
addFaviconToMemCache(url, favicon);
cacheFaviconForUrl(favicon, url).subscribe();
}
// if (favicon != null) {
// addFaviconToMemCache(url, favicon);
// cacheFaviconForUrl(favicon, url).subscribe();
// }
if (favicon == null) {
favicon = defaultFavicon;
}
// if (favicon == null) {
favicon = defaultFavicon;
// }
Bitmap newFavicon = Utils.padFavicon(favicon);