FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Catch JSONFeedAdapter exceptions

This commit is contained in:
Shinokuni 2020-09-20 18:48:43 +02:00
parent 694ff6331e
commit cb41f3c7ac
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
api/src/main/java/com/readrops/api/localfeed/json/JSONFeedAdapter.kt
View File

@ -1,5 +1,6 @@
package com.readrops.api.localfeed.json package com.readrops.api.localfeed.json
import com.readrops.api.utils.ParseException
import com.readrops.api.utils.nextNullableString import com.readrops.api.utils.nextNullableString
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.squareup.moshi.FromJson import com.squareup.moshi.FromJson
@ -13,23 +14,27 @@ class JSONFeedAdapter {
@FromJson @FromJson
fun fromJson(reader: JsonReader): Feed { fun fromJson(reader: JsonReader): Feed {
val feed = Feed() try {
reader.beginObject() val feed = Feed()
reader.beginObject()
while (reader.hasNext()) { while (reader.hasNext()) {
with(feed) { with(feed) {
when (reader.selectName(names)) { when (reader.selectName(names)) {
0 -> name = reader.nextString() 0 -> name = reader.nextString()
1 -> siteUrl = reader.nextNullableString() 1 -> siteUrl = reader.nextNullableString()
2 -> url = reader.nextNullableString() 2 -> url = reader.nextNullableString()
3 -> description = reader.nextNullableString() 3 -> description = reader.nextNullableString()
else -> reader.skipValue() else -> reader.skipValue()
}
} }
} }
}
reader.endObject() reader.endObject()
return feed return feed
} catch (e: Exception) {
throw ParseException(e.message)
}
} }
companion object { companion object {