From baab43f89d9ce41c480ee5bd93dc4b73bf552079 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 31 Oct 2020 16:47:16 +0900 Subject: [PATCH] fix some issues with the model conversions --- .../java/com/dkanada/gramophone/model/Album.java | 2 +- .../java/com/dkanada/gramophone/model/Artist.java | 2 +- .../main/java/com/dkanada/gramophone/model/Song.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/model/Album.java b/app/src/main/java/com/dkanada/gramophone/model/Album.java index 67be145e..e0425950 100644 --- a/app/src/main/java/com/dkanada/gramophone/model/Album.java +++ b/app/src/main/java/com/dkanada/gramophone/model/Album.java @@ -38,7 +38,7 @@ public class Album implements Parcelable { } this.primary = itemDto.getImageTags().containsKey(ImageType.Primary) ? id : null; - if (itemDto.getImageBlurHashes().get(ImageType.Primary) != null) { + if (itemDto.getImageBlurHashes() != null && itemDto.getImageBlurHashes().get(ImageType.Primary) != null) { this.blurHash = (String) itemDto.getImageBlurHashes().get(ImageType.Primary).values().toArray()[0]; } diff --git a/app/src/main/java/com/dkanada/gramophone/model/Artist.java b/app/src/main/java/com/dkanada/gramophone/model/Artist.java index 1d52fef9..f8ff2e65 100644 --- a/app/src/main/java/com/dkanada/gramophone/model/Artist.java +++ b/app/src/main/java/com/dkanada/gramophone/model/Artist.java @@ -28,7 +28,7 @@ public class Artist implements Parcelable { this.name = itemDto.getName(); this.primary = itemDto.getImageTags().containsKey(ImageType.Primary) ? id : null; - if (itemDto.getImageBlurHashes().get(ImageType.Primary) != null) { + if (itemDto.getImageBlurHashes() != null && itemDto.getImageBlurHashes().get(ImageType.Primary) != null) { this.blurHash = (String) itemDto.getImageBlurHashes().get(ImageType.Primary).values().toArray()[0]; } diff --git a/app/src/main/java/com/dkanada/gramophone/model/Song.java b/app/src/main/java/com/dkanada/gramophone/model/Song.java index dba5e445..2612d953 100644 --- a/app/src/main/java/com/dkanada/gramophone/model/Song.java +++ b/app/src/main/java/com/dkanada/gramophone/model/Song.java @@ -67,22 +67,22 @@ public class Song implements Parcelable { } this.primary = itemDto.getAlbumPrimaryImageTag() != null ? albumId : null; - this.favorite = itemDto.getUserData() != null && itemDto.getUserData().getIsFavorite(); - - if (itemDto.getImageBlurHashes().get(ImageType.Primary) != null) { + if (itemDto.getImageBlurHashes() != null && itemDto.getImageBlurHashes().get(ImageType.Primary) != null) { this.blurHash = (String) itemDto.getImageBlurHashes().get(ImageType.Primary).values().toArray()[0]; } + this.favorite = itemDto.getUserData() != null && itemDto.getUserData().getIsFavorite(); + if (itemDto.getMediaSources() != null && itemDto.getMediaSources().get(0) != null) { MediaSourceInfo source = itemDto.getMediaSources().get(0); this.path = source.getPath(); - this.size = source.getSize(); + this.size = source.getSize() != null ? source.getSize() : 0; this.container = source.getContainer(); - this.bitRate = source.getBitrate(); + this.bitRate = source.getBitrate() != null ? source.getBitrate() : 0; - if (source.getMediaStreams() != null && source.getMediaStreams().get(0) != null) { + if (source.getMediaStreams() != null && source.getMediaStreams().size() != 0) { MediaStream stream = source.getMediaStreams().get(0); this.codec = stream.getCodec();