Close that stream...

This commit is contained in:
David A. Velasco 2015-05-12 14:10:36 +02:00
parent 25f5eb193e
commit dd35ee031b

View file

@ -393,6 +393,7 @@ public class PreviewImageFragment extends FileFragment {
Bitmap result = null; Bitmap result = null;
if (params.length != 1) return result; if (params.length != 1) return result;
String storagePath = params[0]; String storagePath = params[0];
InputStream is = null;
try { try {
if (isCancelled()) return result; if (isCancelled()) return result;
@ -400,10 +401,9 @@ public class PreviewImageFragment extends FileFragment {
File picture = new File(storagePath); File picture = new File(storagePath);
if (picture != null) { if (picture != null) {
// Decode file into a bitmap in real size for being able to make zoom on // Decode file into a bitmap in real size for being able to make zoom on the image
// the image is = new FlushedInputStream(new BufferedInputStream(new FileInputStream(picture)));
result = BitmapFactory.decodeStream(new FlushedInputStream result = BitmapFactory.decodeStream(is);
(new BufferedInputStream(new FileInputStream(picture))));
} }
if (isCancelled()) return result; if (isCancelled()) return result;
@ -441,6 +441,14 @@ public class PreviewImageFragment extends FileFragment {
mErrorMessageId = R.string.common_error_unknown; mErrorMessageId = R.string.common_error_unknown;
Log_OC.e(TAG, "Unexpected error loading " + getFile().getStoragePath(), t); Log_OC.e(TAG, "Unexpected error loading " + getFile().getStoragePath(), t);
} finally {
if (is != null) {
try {
is.close();
} catch (IOException e) {
Log_OC.e(TAG, "Unexpected exception closing stream; trying to continue ", e);
}
}
} }
return result; return result;