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

Fix new unread items request

This commit is contained in:
Shinokuni 2019-08-15 16:51:37 +02:00
parent f6c322c4f2
commit 0a0abd4a4d
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
View File

@ -20,8 +20,6 @@ import com.readrops.readropslibrary.services.freshrss.json.FreshRSSFeed;
import com.readrops.readropslibrary.services.freshrss.json.FreshRSSFolder;
import com.readrops.readropslibrary.services.freshrss.json.FreshRSSItem;
import org.joda.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@ -63,12 +61,11 @@ public class FreshRSSRepository extends ARepository {
FreshRSSAPI api = new FreshRSSAPI(new FreshRSSCredentials(account.getToken(), account.getUrl()));
FreshRSSSyncData syncData = new FreshRSSSyncData();
long lastModified = LocalDateTime.now().toDateTime().getMillis();
SyncType syncType;
if (account.getLastModified() != 0) {
syncType = SyncType.CLASSIC_SYNC;
syncData.setLastModified(lastModified / 1000L);
syncData.setLastModified(account.getLastModified());
} else
syncType = SyncType.INITIAL_SYNC;
@ -78,8 +75,8 @@ public class FreshRSSRepository extends ARepository {
insertFeeds(syncResult.getFeeds(), account);
insertItems(syncResult.getItems(), account, syncType == SyncType.INITIAL_SYNC);
account.setLastModified(lastModified);
database.accountDao().updateLastModified(account.getId(), lastModified);
account.setLastModified(syncResult.getLastUpdated());
database.accountDao().updateLastModified(account.getId(), syncResult.getLastUpdated());
return Observable.empty();
});

3
app/src/main/java/com/readrops/app/utils/ItemMatcher.java
View File

@ -40,7 +40,8 @@ public final class ItemMatcher {
newItem.setTitle(item.getTitle());
newItem.setAuthor(item.getAuthor());
newItem.setPubDate(new LocalDateTime(item.getPublished() * 1000L));
newItem.setPubDate(new LocalDateTime(item.getPublished() * 1000L,
DateTimeZone.getDefault()));
newItem.setContent(item.getSummary().getContent());
newItem.setLink(item.getAlternate().get(0).getHref());

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

@ -72,6 +72,7 @@ public class FreshRSSAPI extends API<FreshRSSService> {
})
.flatMap(freshRSSItems -> {
syncResult.setItems(freshRSSItems.getItems());
syncResult.setLastUpdated(freshRSSItems.getUpdated());
return Single.just(syncResult);
});

10
readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSSyncResult.java
View File

@ -15,6 +15,8 @@ public class FreshRSSSyncResult {
private List<FreshRSSItem> items;
private long lastUpdated;
public FreshRSSSyncResult() {
feeds = new ArrayList<>();
items = new ArrayList<>();
@ -36,6 +38,14 @@ public class FreshRSSSyncResult {
this.items = items;
}
public long getLastUpdated() {
return lastUpdated;
}
public void setLastUpdated(long lastUpdated) {
this.lastUpdated = lastUpdated;
}
public List<FreshRSSFolder> getFolders() {
return folders;
}