From 3422edac972bbc3c9aa8da10b2c7066c61cc714b Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sun, 18 Jan 2015 15:00:23 -0800 Subject: Fix crash if both artist info url is null and cover art id is null --- src/github/daneren2005/dsub/util/ImageLoader.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/github/daneren2005/dsub/util/ImageLoader.java b/src/github/daneren2005/dsub/util/ImageLoader.java index 3d554496..97c7f626 100644 --- a/src/github/daneren2005/dsub/util/ImageLoader.java +++ b/src/github/daneren2005/dsub/util/ImageLoader.java @@ -453,14 +453,20 @@ public class ImageLoader { subTask = new ViewUrlTask(mContext, mView, url, mSize) { @Override protected void failedToDownload() { - new ViewImageTask(mContext, mEntry, mSize, mSaveSize, mIsNowPlaying, mView, mCrossfade).execute(); + // Call loadImage so we can take advantage of all of it's logic checks + loadImage(mView, mEntry, mSize == imageSizeLarge, mCrossfade); // Delete subTask so it doesn't get called in done subTask = null; } }; - } else { + } else if(mEntry != null && mEntry.getCoverArt() != null) { subTask = new ViewImageTask(mContext, mEntry, mSize, mSaveSize, mIsNowPlaying, mView, mCrossfade); + } else { + // If entry is null as well, we need to just set as a blank image + Bitmap bitmap = getUnknownImage(mEntry, mSize); + mDrawable = Util.createDrawableFromBitmap(mContext, bitmap); + return null; } // Execute whichever way we decided to go @@ -472,6 +478,8 @@ public class ImageLoader { public void done(Void result) { if(subTask != null) { subTask.done(result); + } else if(mDrawable != null) { + setImage(mView, mDrawable, mCrossfade); } } } -- cgit v1.2.3