diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/ConferenceDto.kt b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/ConferenceDto.kt index 734b1f84..59d0b049 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/ConferenceDto.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/ConferenceDto.kt @@ -8,12 +8,12 @@ import de.nicidienase.chaosflix.common.util.ConferenceUtil data class ConferenceDto( @SerializedName("acronym") var acronym: String = "", @SerializedName("aspect_ratio") var aspectRatio: String = "", - @SerializedName("updated_at") var updatedAt: String = "", + @SerializedName("updated_at") var updatedAt: String? = "", @SerializedName("title") var title: String = "", @SerializedName("schedule_url") var scheduleUrl: String?, @SerializedName("slug") var slug: String = "", @SerializedName("event_last_released_at") var lastReleaseAt: String? = "", - @SerializedName("webgen_location") var webgenLocation: String = "", + @SerializedName("webgen_location") var webgenLocation: String? = "", @SerializedName("logo_url") var logoUrl: String = "", @SerializedName("images_url") var imagesUrl: String = "", @SerializedName("recordings_url") var recordingsUrl: String = "", diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/EventDto.kt b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/EventDto.kt index c24f39b1..0ab8678b 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/EventDto.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/EventDto.kt @@ -15,17 +15,17 @@ data class EventDto( var link: String? = "", var description: String?, @SerializedName("original_language") - var originalLanguage: String = "", + var originalLanguage: String? = "", var persons: Array?, var tags: Array?, var date: String? = "", @SerializedName("release_date") - var releaseDate: String = "", + var releaseDate: String? = "", @SerializedName("updated_at") - var updatedAt: String = "", + var updatedAt: String? = "", var length: Long = 0, @SerializedName("thumb_url") - var thumbUrl: String = "", + var thumbUrl: String? = "", @SerializedName("poster_url") var posterUrl: String = "", @SerializedName("frontend_link") diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/RecordingDto.kt b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/RecordingDto.kt index 390bd9eb..4f6c3465 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/RecordingDto.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/RecordingDto.kt @@ -18,14 +18,14 @@ data class RecordingDto( var width: Int = 0, var height: Int = 0, @SerializedName("updated_at") - var updatedAt: String = "", + var updatedAt: String? = "", @SerializedName("recording_url") var recordingUrl: String = "", var url: String = "", @SerializedName("event_url") var eventUrl: String = "", @SerializedName("conference_url") - var conferenceUrl: String = "" + var conferenceUrl: String? = "" ) { val recordingID: Long get() { diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Conference.kt b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Conference.kt index 36e48058..62c569b8 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Conference.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Conference.kt @@ -54,13 +54,13 @@ data class Conference( aspectRatio = con.aspectRatio, title = con.title, slug = con.slug, - webgenLocation = con.webgenLocation, + webgenLocation = con.webgenLocation ?: "", scheduleUrl = con.scheduleUrl, logoUrl = con.logoUrl, imagesUrl = con.imagesUrl, recordingsUrl = con.recordingsUrl, url = con.url, - updatedAt = con.updatedAt, + updatedAt = con.updatedAt ?: "", tagsUsefull = con.tagsUsefull, lastReleasedAt = con.lastReleaseAt ?: "") diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Event.kt b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Event.kt index e07183a6..e5a7b786 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Event.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Event.kt @@ -94,12 +94,12 @@ data class Event( slug = event.slug, link = event.link, description = event.description, - originalLanguage = event.originalLanguage, + originalLanguage = event.originalLanguage ?: "", date = event.date, - releaseDate = event.releaseDate, - updatedAt = event.updatedAt, + releaseDate = event.releaseDate ?: "", + updatedAt = event.updatedAt ?: "", length = event.length, - thumbUrl = event.thumbUrl, + thumbUrl = event.thumbUrl ?: "", frontendLink = event.frontendLink, url = event.url, conferenceUrl = event.conferenceUrl, diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Recording.kt b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Recording.kt index a20be7cf..5af11f9d 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Recording.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/mediadata/entities/recording/persistence/Recording.kt @@ -76,11 +76,11 @@ data class Recording( isHighQuality = rec.isHighQuality, width = rec.width, height = rec.height, - updatedAt = rec.updatedAt, + updatedAt = rec.updatedAt ?: "", recordingUrl = rec.recordingUrl, url = rec.url, eventUrl = rec.eventUrl, - conferenceUrl = rec.conferenceUrl, + conferenceUrl = rec.conferenceUrl ?: "", backendId = rec.recordingID) override fun writeToParcel(parcel: Parcel, flags: Int) {