Fixes issue where loading a null image with a placeholder but without…

… a fallback drawable or error drawable would cause the loaded image to be null. Patched from [] by angelorhoit@.
bumptech · Jun 15, 2017 · 41cc06c · 41cc06c
1 parent 48d1f14
commit 41cc06c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/library/src/main/java/com/bumptech/glide/request/SingleRequest.java b/library/src/main/java/com/bumptech/glide/request/SingleRequest.java
@@ -381,11 +381,14 @@ private void setErrorPlaceholder() {
     if (model == null) {
       error = getFallbackDrawable();
     }
-    // Either the model isn't null, or there was no fallback drawable set. Either way we should show
-    // the error Drawable.
+    // Either the model isn't null, or there was no fallback drawable set.
     if (error == null) {
       error = getErrorDrawable();
     }
+    // The model isn't null, no fallback drawable was set or no error drawable was set.
+    if (error == null) {
+      error = getPlaceholderDrawable();
+    }
     target.onLoadFailed(error);
   }
 

diff --git a/library/src/test/java/com/bumptech/glide/GlideTest.java b/library/src/test/java/com/bumptech/glide/GlideTest.java
@@ -523,6 +523,18 @@ public void testNullModelPrefersFallbackDrawable() {
     verify(target).onLoadFailed(eq(fallback));
   }
 
+  @Test
+  public void testNullModelResolvesToUsePlaceholder() {
+    Drawable placeholder = new ColorDrawable(Color.GREEN);
+
+    requestManager
+        .load(null)
+        .apply(placeholderOf(placeholder))
+        .into(target);
+
+    verify(target).onLoadFailed(eq(placeholder));
+  }
+
   @Test
   public void testByteData() {
     byte[] data = new byte[] { 1, 2, 3, 4, 5, 6 };