From c85f9f07221cf769663cd172fc5102cce50fe9c1 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sat, 6 Feb 2016 12:41:37 +0100 Subject: [PATCH] Probably fixed a NPE --- .../gramophone/glide/artistimage/ArtistImageFetcher.java | 3 ++- .../glide/audiocover/AudioFileCoverFetcher.java | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java b/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java index 8dd8273a..8f801309 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java +++ b/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java @@ -42,7 +42,8 @@ public class ArtistImageFetcher implements DataFetcher { @Override public String getId() { - return model.artistName; + // makes sure we never ever return null here + return String.valueOf(model.artistName); } @Override diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java b/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java index 49c4b4c6..9755c7f7 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java +++ b/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java @@ -12,8 +12,6 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import hugo.weaving.DebugLog; - /** * @author Karim Abou Zeid (kabouzeid) */ @@ -25,13 +23,12 @@ public class AudioFileCoverFetcher implements DataFetcher { this.model = model; } - @DebugLog @Override public String getId() { - return model.filePath; + // makes sure we never ever return null here + return String.valueOf(model.filePath); } - @DebugLog @Override public InputStream loadData(Priority priority) throws Exception { MediaMetadataRetriever retriever = new MediaMetadataRetriever(); @@ -50,7 +47,6 @@ public class AudioFileCoverFetcher implements DataFetcher { private static final String[] FALLBACKS = {"cover.jpg", "album.jpg", "folder.jpg"}; - @DebugLog private InputStream fallback(String path) throws FileNotFoundException { File parent = new File(path).getParentFile(); for (String fallback : FALLBACKS) {