aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2011-11-01 15:33:25 +0100
committerSamuel Tardieu <sam@rfc1149.net>2011-11-01 15:37:04 +0100
commita4e77231246031d1614929334453c5c9299bca17 (patch)
tree11ce91a7153db0677e22b96b7040a73e93a7baaf /main/src
parentce156ecd87df9372ff4a5f27fd56ffb30542db93 (diff)
downloadcgeo-a4e77231246031d1614929334453c5c9299bca17.zip
cgeo-a4e77231246031d1614929334453c5c9299bca17.tar.gz
cgeo-a4e77231246031d1614929334453c5c9299bca17.tar.bz2
Decode images that are not saved to disk
This fixes #742.
Diffstat (limited to 'main/src')
-rw-r--r--main/src/cgeo/geocaching/network/HtmlImage.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java
index 59aa002..b3511e3 100644
--- a/main/src/cgeo/geocaching/network/HtmlImage.java
+++ b/main/src/cgeo/geocaching/network/HtmlImage.java
@@ -22,6 +22,8 @@ import android.view.Display;
import android.view.WindowManager;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Date;
public class HtmlImage implements Html.ImageGetter {
@@ -101,6 +103,15 @@ public class HtmlImage implements Html.ImageGetter {
if (save) {
final File file = LocalStorage.getStorageFile(geocode, url, true);
LocalStorage.saveEntityToFile(bufferedEntity, file);
+ } else {
+ setSampleSize(bufferedEntity.getContentLength());
+ InputStream is;
+ try {
+ is = bufferedEntity.getContent();
+ imagePre = BitmapFactory.decodeStream(is, null, bfOptions);
+ } catch (IOException e) {
+ Log.e(Settings.tag, "HtmlImage.getDrawable (decoding image)", e);
+ }
}
}