Browse Source

Switching to IO scheduler and cleaning up cache method

master
anthony restaino 8 years ago
parent
commit
bb7ec7fd3f
  1. 4
      app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java
  2. 2
      app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java
  3. 6
      app/src/main/java/acr/browser/lightning/view/LightningChromeClient.java

4
app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java

@ -190,8 +190,8 @@ public final class BookmarkPage {
if (bookmarkUri != null) { if (bookmarkUri != null) {
File faviconFile = FaviconModel.getFaviconCacheFile(mApp, bookmarkUri); File faviconFile = FaviconModel.getFaviconCacheFile(mApp, bookmarkUri);
if (!faviconFile.exists()) { if (!faviconFile.exists()) {
mFaviconModel.cacheFaviconForUrl(mFaviconModel.getDefaultBitmapForString(item.getTitle()), item.getUrl()) Bitmap defaultFavicon = mFaviconModel.getDefaultBitmapForString(item.getTitle());
.subscribe(); mFaviconModel.cacheFaviconForUrl(defaultFavicon, item.getUrl()).subscribe();
} }
faviconFileUrl = Constants.FILE + faviconFile; faviconFileUrl = Constants.FILE + faviconFile;

2
app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java

@ -538,7 +538,7 @@ public class BookmarksFragment extends Fragment implements View.OnClickListener,
SubscriptionUtils.safeUnsubscribe(oldSubscription); SubscriptionUtils.safeUnsubscribe(oldSubscription);
final Subscription faviconSubscription = mFaviconModel.faviconForUrl(url, web.getTitle()) final Subscription faviconSubscription = mFaviconModel.faviconForUrl(url, web.getTitle())
.subscribeOn(Schedulers.worker()) .subscribeOn(Schedulers.io())
.observeOn(Schedulers.main()) .observeOn(Schedulers.main())
.subscribe(new SingleOnSubscribe<Bitmap>() { .subscribe(new SingleOnSubscribe<Bitmap>() {
@Override @Override

6
app/src/main/java/acr/browser/lightning/view/LightningChromeClient.java

@ -73,12 +73,6 @@ public class LightningChromeClient extends WebChromeClient {
return; return;
} }
Uri uri = Uri.parse(url);
if (uri.getHost() == null) {
return;
}
mFaviconModel.cacheFaviconForUrl(icon, url) mFaviconModel.cacheFaviconForUrl(icon, url)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.subscribe(); .subscribe();

Loading…
Cancel
Save