Added target from cache

library/src/com/bumptech/glide/presenter/ImagePresenter.java

@@ -453,7 +453,7 @@ private void fetchImage(final T model, int width, int height, final int loadCoun
             public boolean onImageReady(Bitmap image) {
                 if (loadCount != currentCount || !canSetImage() || image == null) return false;
 
-                target.onImageReady(image);
+                target.onImageReady(image, loadedFromCache);
                 if (imageReadyCallback != null)
                     imageReadyCallback.onImageReady(model, target, loadedFromCache);
                 isImageSet = true;

library/src/com/bumptech/glide/presenter/target/ImageViewTarget.java

@@ -24,7 +24,7 @@ public ImageViewTarget(ImageView imageView) {
     }
 
     @Override
-    public void onImageReady(Bitmap bitmap) {
+    public void onImageReady(Bitmap bitmap, boolean fromCache) {
         imageView.setImageBitmap(bitmap);
     }
 

library/src/com/bumptech/glide/presenter/target/Target.java

@@ -20,9 +20,10 @@ public interface SizeReadyCallback {
 
     /**
      * The method that will be called when the image load has finished
+     * @param fromCache True if the bitmap comes from a local cache (memory or disk).
      * @param bitmap The loaded image
      */
-    public void onImageReady(Bitmap bitmap);
+    public void onImageReady(Bitmap bitmap, boolean fromCache);
 
     /**
      * A method that can optionally be implemented to set any placeholder that might have been passed to Glide to

library/src/com/bumptech/glide/resize/bitmap_recycle/LruBitmapPool.java

@@ -22,6 +22,10 @@ public LruBitmapPool(int maxSize) {
 
     @Override
     public synchronized boolean put(Bitmap bitmap) {
+        // BitmapFactory.decodeStream can sometimes return bitmaps with null configs, which can't generally be reused
+        if (bitmap.getConfig() == null)
+            return false;
+
         final int size = getSize(bitmap);
 
         pool.put(bitmap);
@@ -126,6 +130,10 @@ public int hashCode() {
         }
 
         public void put(Bitmap bitmap) {
+            // BitmapFactory.decodeStream can sometimes return bitmaps with null configs, which can't generally be reused
+            if (bitmap.getConfig() == null)
+                return;
+
             final Key key = keyPool.get(bitmap.getWidth(), bitmap.getHeight(), bitmap.getConfig());
 
             LinkedEntry entry = keyToEntry.get(key);