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

Switching to IO scheduler and cleaning up cache method

Browse Source
This commit is contained in:
anthony restaino 2017-06-14 22:50:05 -04:00
parent 33f205d557
commit bb7ec7fd3f
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

40
app/src/main/java/acr/browser/lightning/view/LightningChromeClient.java
View File

@ -73,15 +73,9 @@ public class LightningChromeClient extends WebChromeClient {
return;
}
Uri uri = Uri.parse(url);
if (uri.getHost() == null) {
return;
}
mFaviconModel.cacheFaviconForUrl(icon, url)
.subscribeOn(Schedulers.io())
.subscribe();
.subscribeOn(Schedulers.io())
.subscribe();
}
@ -114,21 +108,21 @@ public class LightningChromeClient extends WebChromeClient {
org = origin;
}
builder.setMessage(org + mActivity.getString(R.string.message_location))
.setCancelable(true)
.setPositiveButton(mActivity.getString(R.string.action_allow),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
callback.invoke(origin, true, remember);
}
})
.setNegativeButton(mActivity.getString(R.string.action_dont_allow),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
callback.invoke(origin, false, remember);
}
});
.setCancelable(true)
.setPositiveButton(mActivity.getString(R.string.action_allow),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
callback.invoke(origin, true, remember);
}
})
.setNegativeButton(mActivity.getString(R.string.action_dont_allow),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
callback.invoke(origin, false, remember);
}
});
AlertDialog alert = builder.create();
alert.show();
BrowserDialog.setDialogSize(mActivity, alert);