mirror of https://github.com/readrops/Readrops.git
Fix FeverFeedsAdapter parsing (fixes #228)
This commit is contained in:
parent
d306bff63e
commit
d2dff633e1
|
@ -31,14 +31,12 @@ class FeverFeedsAdapter : JsonAdapter<FeverFeeds>() {
|
|||
|
||||
beginObject()
|
||||
|
||||
// skip based fields (api_version, auth, last_refreshed...)
|
||||
repeat(3) {
|
||||
skipField()
|
||||
while (nextName() != "feeds") {
|
||||
skipValue()
|
||||
}
|
||||
|
||||
nextName() // beginning of feeds array
|
||||
// feeds array
|
||||
beginArray()
|
||||
|
||||
while (hasNext()) {
|
||||
beginObject()
|
||||
|
||||
|
@ -62,9 +60,12 @@ class FeverFeedsAdapter : JsonAdapter<FeverFeeds>() {
|
|||
|
||||
endArray()
|
||||
|
||||
nextName()
|
||||
beginArray()
|
||||
while (nextName() != "feeds_groups") {
|
||||
skipValue()
|
||||
}
|
||||
|
||||
// feeds_groups array
|
||||
beginArray()
|
||||
while (hasNext()) {
|
||||
beginObject()
|
||||
|
||||
|
@ -83,6 +84,11 @@ class FeverFeedsAdapter : JsonAdapter<FeverFeeds>() {
|
|||
}
|
||||
|
||||
endArray()
|
||||
|
||||
while (peek() != JsonReader.Token.END_OBJECT) {
|
||||
skipField()
|
||||
}
|
||||
|
||||
endObject()
|
||||
|
||||
FeverFeeds(
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"api_version": 3,
|
||||
"auth": 1,
|
||||
"last_refreshed_on_time": 1640284745,
|
||||
"feeds": [
|
||||
{
|
||||
"id": 32,
|
||||
|
@ -13,10 +12,12 @@
|
|||
"last_updated_on_time": 1640364024
|
||||
}
|
||||
],
|
||||
"last_refreshed_on_time": 1640284745,
|
||||
"feeds_groups": [
|
||||
{
|
||||
"group_id": 3,
|
||||
"feed_ids": "5,4"
|
||||
}
|
||||
]
|
||||
],
|
||||
"another_field": "another_value"
|
||||
}
|
Loading…
Reference in New Issue