Make Entry always have an id

core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt

@@ -36,7 +36,7 @@ class MusicDirectory {
     }
 
     data class Entry(
-        override var id: String? = null,
+        override var id: String,
         var parent: String? = null,
         var isDirectory: Boolean = false,
         var title: String? = null,

ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt

@@ -13,8 +13,7 @@ internal val dateFormat: DateFormat by lazy {
     SimpleDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.getDefault())
 }
 
-fun MusicDirectoryChild.toDomainEntity(): MusicDirectory.Entry = MusicDirectory.Entry().apply {
-    id = this@toDomainEntity.id
+fun MusicDirectoryChild.toDomainEntity(): MusicDirectory.Entry = MusicDirectory.Entry(id).apply {
     parent = this@toDomainEntity.parent
     isDirectory = this@toDomainEntity.isDir
     title = this@toDomainEntity.title

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumRowAdapter.kt

@@ -57,7 +57,7 @@ class AlbumRowAdapter(
 
             imageLoader.loadImage(
                 holder.coverArt,
-                MusicDirectory.Entry().apply { coverArt = holder.coverArtId },
+                MusicDirectory.Entry("-1").apply { coverArt = holder.coverArtId },
                 false, 0, false, true, R.drawable.unknown_album
             )
         }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistRowAdapter.kt

@@ -62,7 +62,7 @@ class ArtistRowAdapter(
                 holder.coverArt.visibility = View.VISIBLE
                 imageLoader.loadImage(
                     holder.coverArt,
-                    MusicDirectory.Entry().apply { coverArt = holder.coverArtId },
+                    MusicDirectory.Entry("-1").apply { coverArt = holder.coverArtId },
                     false, 0, false, true, R.drawable.ic_contact_picture
                 )
             } else {