diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt index 2dd1da5..d566a7b 100644 --- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt +++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt @@ -6,12 +6,12 @@ class MercuryModel { @Serializable class ParsedContent( - val title: String?, - val content: String?, - val lead_image_url: String?, // NOSONAR - val url: String?, - val error: Boolean?, - val message: String?, - val failed: Boolean? + val title: String? = null, + val content: String? = null, + val lead_image_url: String? = null, // NOSONAR + val url: String? = null, + val error: Boolean? = null, + val message: String? = null, + val failed: Boolean? = null ) } diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt index eebfb77..9068c9a 100644 --- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt +++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt @@ -24,8 +24,8 @@ class SelfossModel { @Serializable class Stats( val total: Int, - val unread: Int?, - val starred: Int? + val unread: Int? = null, + val starred: Int? = null ) @Serializable @@ -36,9 +36,9 @@ class SelfossModel { @Serializable data class ApiInformation( - val version: String?, - val apiversion: String?, - val configuration: ApiConfiguration? + val version: String? = null, + val apiversion: String? = null, + val configuration: ApiConfiguration? = null ) { fun getApiMajorVersion(): Int { var versionNumber = 0 @@ -54,9 +54,9 @@ class SelfossModel { @Serializable data class ApiConfiguration( @Serializable(with = BooleanSerializer::class) - val publicMode: Boolean?, + val publicMode: Boolean? = null, @Serializable(with = BooleanSerializer::class) - val authEnabled: Boolean? + val authEnabled: Boolean? = null ) { fun isAuthEnabled() = authEnabled ?: true @@ -75,7 +75,7 @@ class SelfossModel { data class SourceStats( override val id: Int, override var title: String, - override var unread: Int?, + override var unread: Int? = null, override var error: String? = null, override var icon: String? = null ) : Source @@ -86,11 +86,11 @@ class SelfossModel { override var title: String, override var unread: Int? = null, @Serializable(with = TagsListSerializer::class) - var tags: List?, - var spout: String?, - override var error: String?, - override var icon: String?, - var params: SourceParams? + var tags: List? = null, + var spout: String? = null, + override var error: String? = null, + override var icon: String? = null, + var params: SourceParams? = null ) : Source @Serializable @@ -107,13 +107,13 @@ class SelfossModel { var unread: Boolean, @Serializable(with = BooleanSerializer::class) var starred: Boolean, - val thumbnail: String?, - val icon: String?, + val thumbnail: String? = null, + val icon: String? = null, val link: String, val sourcetitle: String, @Serializable(with = TagsListSerializer::class) val tags: List, - val author: String? + val author: String? = null ) { fun getLinkDecoded(): String { var stringUrl: String diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt index 7f6f59e..b97bd93 100644 --- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt +++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt @@ -36,6 +36,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { prettyPrint = true isLenient = true ignoreUnknownKeys = true + explicitNulls = false }) } install(Logging) {