mirror of https://github.com/readrops/Readrops.git
Catch JSONFeedAdapter exceptions
This commit is contained in:
parent
694ff6331e
commit
cb41f3c7ac
|
@ -1,5 +1,6 @@
|
|||
package com.readrops.api.localfeed.json
|
||||
|
||||
import com.readrops.api.utils.ParseException
|
||||
import com.readrops.api.utils.nextNullableString
|
||||
import com.readrops.db.entities.Feed
|
||||
import com.squareup.moshi.FromJson
|
||||
|
@ -13,23 +14,27 @@ class JSONFeedAdapter {
|
|||
|
||||
@FromJson
|
||||
fun fromJson(reader: JsonReader): Feed {
|
||||
val feed = Feed()
|
||||
reader.beginObject()
|
||||
try {
|
||||
val feed = Feed()
|
||||
reader.beginObject()
|
||||
|
||||
while (reader.hasNext()) {
|
||||
with(feed) {
|
||||
when (reader.selectName(names)) {
|
||||
0 -> name = reader.nextString()
|
||||
1 -> siteUrl = reader.nextNullableString()
|
||||
2 -> url = reader.nextNullableString()
|
||||
3 -> description = reader.nextNullableString()
|
||||
else -> reader.skipValue()
|
||||
while (reader.hasNext()) {
|
||||
with(feed) {
|
||||
when (reader.selectName(names)) {
|
||||
0 -> name = reader.nextString()
|
||||
1 -> siteUrl = reader.nextNullableString()
|
||||
2 -> url = reader.nextNullableString()
|
||||
3 -> description = reader.nextNullableString()
|
||||
else -> reader.skipValue()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
reader.endObject()
|
||||
return feed
|
||||
reader.endObject()
|
||||
return feed
|
||||
} catch (e: Exception) {
|
||||
throw ParseException(e.message)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
|
Loading…
Reference in New Issue