X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fandroid%2FImageUtilsAndroid.java;h=c2e269cc58291cfbcb32d2e105c7d63938c6e136;hb=5584adbbbf5444c0039fed2b35dc7d5bb57b71b1;hp=d55e602cb89d247e6056caec1f49c9b484de7ed4;hpb=a2c1d5fed2dca110c7cd5968b78baa3e1a6a16e9;p=fanfix.git

diff --git a/src/be/nikiroo/utils/android/ImageUtilsAndroid.java b/src/be/nikiroo/utils/android/ImageUtilsAndroid.java
index d55e602..c2e269c 100644
--- a/src/be/nikiroo/utils/android/ImageUtilsAndroid.java
+++ b/src/be/nikiroo/utils/android/ImageUtilsAndroid.java
@@ -10,8 +10,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.stream.Stream;
 
-import javax.imageio.ImageIO;
-
 import be.nikiroo.utils.Image;
 import be.nikiroo.utils.ImageUtils;
 import be.nikiroo.utils.StringUtils;
@@ -26,7 +24,7 @@ public class ImageUtilsAndroid extends ImageUtils {
 	@Override
 	protected boolean check() {
 		// If we can get the class, it means we have access to it
-		Config.ALPHA_8;
+		Config c = Config.ALPHA_8;
 		return true;
 	}
 
@@ -47,7 +45,7 @@ public class ImageUtilsAndroid extends ImageUtils {
 			}
 
 			// Some formats are not reliable
-			// Second change: PNG
+			// Second chance: PNG
 			if (!ok && !format.equals("png")) {
 				ok = image.compress(Bitmap.CompressFormat.PNG, 90, fos);
 			}
@@ -78,14 +76,24 @@ public class ImageUtilsAndroid extends ImageUtils {
 		try {
 			Bitmap image = BitmapFactory.decodeStream(stream);
 			if (image == null) {
+				String extra = "";
+				if (img.getSize() <= 2048) {
+					try {
+						extra = ", content: "
+								+ new String(img.getData(), "UTF-8");
+					} catch (Exception e) {
+						extra = ", content unavailable";
+					}
+				}
 				String ssize = StringUtils.formatNumber(img.getSize());
 				throw new IOException(
-						"Failed to convert input to image, size was: " + ssize);
+						"Failed to convert input to image, size was: " + ssize
+								+ extra);
 			}
+
+			return image;
 		} finally {
 			stream.close();
 		}
-		
-		return image;
 	}
 }