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

Fix broken icon downloading, handle edge cases where url parameter is bad

Browse Source
This commit is contained in:
Anthony Restaino 2015-09-09 23:40:54 -04:00
parent 3fab58955c
commit 838270b4b0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/acr/browser/lightning/utils/DownloadImageTask.java
View File

@ -14,6 +14,7 @@ import java.io.InputStream;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.constant.Constants; import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.database.HistoryItem; import acr.browser.lightning.database.HistoryItem;
@ -32,7 +33,7 @@ public class DownloadImageTask extends AsyncTask<Void, Void, Bitmap> {
@NonNull Bitmap defaultBitmap) { @NonNull Bitmap defaultBitmap) {
this.bmImage = bmImage; this.bmImage = bmImage;
this.mWeb = web; this.mWeb = web;
this.mCacheDir = bmImage.getContext().getCacheDir(); this.mCacheDir = BrowserApp.getAppContext().getCacheDir();
this.mUrl = web.getUrl(); this.mUrl = web.getUrl();
this.mDefaultBitmap = defaultBitmap; this.mDefaultBitmap = defaultBitmap;
} }
@ -40,18 +41,23 @@ public class DownloadImageTask extends AsyncTask<Void, Void, Bitmap> {
protected Bitmap doInBackground(Void... params) { protected Bitmap doInBackground(Void... params) {
Bitmap mIcon = null; Bitmap mIcon = null;
// unique path for each url that is bookmarked. // unique path for each url that is bookmarked.
if (mUrl == null) {
return mDefaultBitmap;
}
final Uri uri = Uri.parse(mUrl); final Uri uri = Uri.parse(mUrl);
if (uri.getHost() == null || uri.getScheme() == null) {
return mDefaultBitmap;
}
final String hash = String.valueOf(uri.getHost().hashCode()); final String hash = String.valueOf(uri.getHost().hashCode());
final File image = new File(mCacheDir, hash + ".png"); final File image = new File(mCacheDir, hash + ".png");
final Uri urldisplay = Uri.fromParts(uri.getScheme(), uri.getHost(), "favicon.ico"); final String urlDisplay = uri.getScheme() + "://" + uri.getHost() + "/favicon.ico";
// checks to see if the image exists // checks to see if the image exists
if (!image.exists()) { if (!image.exists()) {
FileOutputStream fos = null; FileOutputStream fos = null;
InputStream in = null; InputStream in = null;
try { try {
// if not, download it... // if not, download it...
final URL urlDownload = new URL(urldisplay.toString()); final URL urlDownload = new URL(urlDisplay);
final HttpURLConnection connection = (HttpURLConnection) urlDownload.openConnection(); final HttpURLConnection connection = (HttpURLConnection) urlDownload.openConnection();
connection.setDoInput(true); connection.setDoInput(true);
connection.connect(); connection.connect();
@ -65,7 +71,7 @@ public class DownloadImageTask extends AsyncTask<Void, Void, Bitmap> {
fos = new FileOutputStream(image); fos = new FileOutputStream(image);
mIcon.compress(Bitmap.CompressFormat.PNG, 100, fos); mIcon.compress(Bitmap.CompressFormat.PNG, 100, fos);
fos.flush(); fos.flush();
Log.d(Constants.TAG, "Downloaded: " + urldisplay); Log.d(Constants.TAG, "Downloaded: " + urlDisplay);
} }
} catch (Exception e) { } catch (Exception e) {