Binnette/ReaderForSelfoss-multiplatform
1
0
Fork 0
forked from Louvorg/ReaderForSelfoss-multiplatform
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix: illegal input.

Browse Source
This commit is contained in:
aminecmi 2023-05-13 22:14:16 +02:00
parent e6baed8cb4
commit ecd23213f9
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt
View File

@ -6,12 +6,12 @@ class MercuryModel {
@Serializable @Serializable
class ParsedContent( class ParsedContent(
val title: String?, val title: String? = null,
val content: String?, val content: String? = null,
val lead_image_url: String?, // NOSONAR val lead_image_url: String? = null, // NOSONAR
val url: String?, val url: String? = null,
val error: Boolean?, val error: Boolean? = null,
val message: String?, val message: String? = null,
val failed: Boolean? val failed: Boolean? = null
) )
} }

32
shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt
View File

@ -24,8 +24,8 @@ class SelfossModel {
@Serializable @Serializable
class Stats( class Stats(
val total: Int, val total: Int,
val unread: Int?, val unread: Int? = null,
val starred: Int? val starred: Int? = null
) )
@Serializable @Serializable
@ -36,9 +36,9 @@ class SelfossModel {
@Serializable @Serializable
data class ApiInformation( data class ApiInformation(
val version: String?, val version: String? = null,
val apiversion: String?, val apiversion: String? = null,
val configuration: ApiConfiguration? val configuration: ApiConfiguration? = null
) { ) {
fun getApiMajorVersion(): Int { fun getApiMajorVersion(): Int {
var versionNumber = 0 var versionNumber = 0
@ -54,9 +54,9 @@ class SelfossModel {
@Serializable @Serializable
data class ApiConfiguration( data class ApiConfiguration(
@Serializable(with = BooleanSerializer::class) @Serializable(with = BooleanSerializer::class)
val publicMode: Boolean?, val publicMode: Boolean? = null,
@Serializable(with = BooleanSerializer::class) @Serializable(with = BooleanSerializer::class)
val authEnabled: Boolean? val authEnabled: Boolean? = null
) { ) {
fun isAuthEnabled() = authEnabled ?: true fun isAuthEnabled() = authEnabled ?: true
@ -75,7 +75,7 @@ class SelfossModel {
data class SourceStats( data class SourceStats(
override val id: Int, override val id: Int,
override var title: String, override var title: String,
override var unread: Int?, override var unread: Int? = null,
override var error: String? = null, override var error: String? = null,
override var icon: String? = null override var icon: String? = null
) : Source ) : Source
@ -86,11 +86,11 @@ class SelfossModel {
override var title: String, override var title: String,
override var unread: Int? = null, override var unread: Int? = null,
@Serializable(with = TagsListSerializer::class) @Serializable(with = TagsListSerializer::class)
var tags: List<String>?, var tags: List<String>? = null,
var spout: String?, var spout: String? = null,
override var error: String?, override var error: String? = null,
override var icon: String?, override var icon: String? = null,
var params: SourceParams? var params: SourceParams? = null
) : Source ) : Source
@Serializable @Serializable
@ -107,13 +107,13 @@ class SelfossModel {
var unread: Boolean, var unread: Boolean,
@Serializable(with = BooleanSerializer::class) @Serializable(with = BooleanSerializer::class)
var starred: Boolean, var starred: Boolean,
val thumbnail: String?, val thumbnail: String? = null,
val icon: String?, val icon: String? = null,
val link: String, val link: String,
val sourcetitle: String, val sourcetitle: String,
@Serializable(with = TagsListSerializer::class) @Serializable(with = TagsListSerializer::class)
val tags: List<String>, val tags: List<String>,
val author: String? val author: String? = null
) { ) {
fun getLinkDecoded(): String { fun getLinkDecoded(): String {
var stringUrl: String var stringUrl: String

1
shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt
View File

@ -36,6 +36,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
prettyPrint = true prettyPrint = true
isLenient = true isLenient = true
ignoreUnknownKeys = true ignoreUnknownKeys = true
explicitNulls = false
}) })
} }
install(Logging) { install(Logging) {