tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Probably fixed a NPE

Browse source
This commit is contained in:
Karim Abou Zeid 2016-02-06 12:41:37 +01:00
commit c85f9f0722
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java
View file

@ -42,7 +42,8 @@ public class ArtistImageFetcher implements DataFetcher<InputStream> {
@Override @Override
public String getId() { public String getId() {
return model.artistName; // makes sure we never ever return null here
return String.valueOf(model.artistName);
} }
@Override @Override

8
app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java
View file

@ -12,8 +12,6 @@ import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import hugo.weaving.DebugLog;
/** /**
* @author Karim Abou Zeid (kabouzeid) * @author Karim Abou Zeid (kabouzeid)
*/ */
@ -25,13 +23,12 @@ public class AudioFileCoverFetcher implements DataFetcher<InputStream> {
this.model = model; this.model = model;
} }
@DebugLog
@Override @Override
public String getId() { public String getId() {
return model.filePath; // makes sure we never ever return null here
return String.valueOf(model.filePath);
} }
@DebugLog
@Override @Override
public InputStream loadData(Priority priority) throws Exception { public InputStream loadData(Priority priority) throws Exception {
MediaMetadataRetriever retriever = new MediaMetadataRetriever(); MediaMetadataRetriever retriever = new MediaMetadataRetriever();
@ -50,7 +47,6 @@ public class AudioFileCoverFetcher implements DataFetcher<InputStream> {
private static final String[] FALLBACKS = {"cover.jpg", "album.jpg", "folder.jpg"}; private static final String[] FALLBACKS = {"cover.jpg", "album.jpg", "folder.jpg"};
@DebugLog
private InputStream fallback(String path) throws FileNotFoundException { private InputStream fallback(String path) throws FileNotFoundException {
File parent = new File(path).getParentFile(); File parent = new File(path).getParentFile();
for (String fallback : FALLBACKS) { for (String fallback : FALLBACKS) {