Check null

VocaDB · Oct 13, 2019 · d20cc92 · d20cc92
1 parent 267b78e
commit d20cc92
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/lib/models/artist_model.dart b/lib/models/artist_model.dart
@@ -21,7 +21,7 @@ class ArtistModel extends EntryModel {
         description = json['description'],
         releaseDate = json['releaseDate'],
         relations = (json.containsKey('relations'))
-            ? ArtistRelations.fromJson(json['relations'])
+            ? ArtistRelations.fromJson(json['relations'] ?? {})
             : null,
         baseVoicebank = (json.containsKey('baseVoicebank') &&
                 !(json['baseVoicebank'] is int))

diff --git a/lib/models/entry_model.dart b/lib/models/entry_model.dart
@@ -36,7 +36,7 @@ class EntryModel extends BaseModel {
         artistString = json['artistString'],
         artistType = json['artistType'],
         mainPicture = json.containsKey('mainPicture')
-            ? MainPictureModel.fromJson(json['mainPicture'])
+            ? MainPictureModel.fromJson(json['mainPicture'] ?? {})
             : null,
         tagGroups = (json.containsKey('tags'))
             ? (json['tags'] as List)

diff --git a/lib/models/main_picture_model.dart b/lib/models/main_picture_model.dart
@@ -1,3 +1,5 @@
+import 'dart:collection';
+
 class MainPictureModel {
   String meme;
   String urlSmallThumb;