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

Get read state from new items

This commit is contained in:
Shinokuni 2020-01-06 11:28:03 +01:00
parent 0949cbf8d2
commit 192d3ca5dc
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSAPI.java
View File

@ -110,7 +110,7 @@ public class FreshRSSAPI extends API<FreshRSSService> {
if (syncType == SyncType.INITIAL_SYNC) { if (syncType == SyncType.INITIAL_SYNC) {
return getItems(GOOGLE_READ, MAX_ITEMS, null); return getItems(GOOGLE_READ, MAX_ITEMS, null);
} else { } else {
return getItems(GOOGLE_READ, MAX_ITEMS, syncData.getLastModified()); return getItems(null, MAX_ITEMS, syncData.getLastModified());
} }
}) })
.flatMap(freshRSSItems -> { .flatMap(freshRSSItems -> {

22
readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSItemsAdapter.kt
View File

@ -2,6 +2,7 @@ package com.readrops.readropslibrary.services.freshrss.adapters
import android.util.TimingLogger import android.util.TimingLogger
import com.readrops.readropsdb.entities.Item import com.readrops.readropsdb.entities.Item
import com.readrops.readropslibrary.services.freshrss.FreshRSSAPI.GOOGLE_READ
import com.squareup.moshi.JsonAdapter import com.squareup.moshi.JsonAdapter
import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonReader
import com.squareup.moshi.JsonWriter import com.squareup.moshi.JsonWriter
@ -47,8 +48,9 @@ class FreshRSSItemsAdapter : JsonAdapter<List<Item>>() {
2 -> title = reader.nextString() 2 -> title = reader.nextString()
3 -> content = getContent(reader) 3 -> content = getContent(reader)
4 -> link = getLink(reader) 4 -> link = getLink(reader)
5 -> feedRemoteId = getRemoteFeedId(reader) 5 -> isRead = getReadState(reader)
6 -> author = reader.nextString() 6 -> feedRemoteId = getRemoteFeedId(reader)
7 -> author = reader.nextString()
else -> reader.skipValue() else -> reader.skipValue()
} }
} }
@ -95,6 +97,20 @@ class FreshRSSItemsAdapter : JsonAdapter<List<Item>>() {
return href return href
} }
private fun getReadState(reader: JsonReader): Boolean {
var isRead = false
reader.beginArray()
while (reader.hasNext()) {
when (reader.nextString()) {
GOOGLE_READ -> isRead = true
}
}
reader.endArray()
return isRead
}
private fun getRemoteFeedId(reader: JsonReader): String? { private fun getRemoteFeedId(reader: JsonReader): String? {
var remoteFeedId: String? = null var remoteFeedId: String? = null
reader.beginObject() reader.beginObject()
@ -111,7 +127,7 @@ class FreshRSSItemsAdapter : JsonAdapter<List<Item>>() {
} }
companion object { companion object {
val NAMES: JsonReader.Options = JsonReader.Options.of("id", "published", "title", "summary", "alternate", "origin", "author") val NAMES: JsonReader.Options = JsonReader.Options.of("id", "published", "title", "summary", "alternate", "categories", "origin", "author")
val TAG = FreshRSSItemsAdapter::class.java.simpleName val TAG = FreshRSSItemsAdapter::class.java.simpleName
} }