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

Fix local items not linked to the right feeds

This commit is contained in:
Shinokuni 2019-08-26 10:35:47 +02:00
parent 5656817dea
commit 959614d99e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/readrops/app/database/dao/FeedDao.java
View File

@ -30,8 +30,8 @@ public abstract class FeedDao implements BaseDao<Feed> {
@Query("Select count(*) from Feed Where account_id = :accountId") @Query("Select count(*) from Feed Where account_id = :accountId")
public abstract Single<Integer> getFeedCount(int accountId); public abstract Single<Integer> getFeedCount(int accountId);
@Query("Select * from Feed Where url = :feedUrl") @Query("Select * from Feed Where url = :feedUrl And account_id = :accountId")
public abstract Feed getFeedByUrl(String feedUrl); public abstract Feed getFeedByUrl(String feedUrl, int accountId);
@Query("Select id from Feed Where remoteId = :remoteId And account_id = :accountId") @Query("Select id from Feed Where remoteId = :remoteId And account_id = :accountId")
public abstract int getFeedIdByRemoteId(String remoteId, int accountId); public abstract int getFeedIdByRemoteId(String remoteId, int accountId);

6
app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java
View File

@ -151,15 +151,15 @@ public class LocalFeedRepository extends ARepository<Void> {
switch (type) { switch (type) {
case RSS_2: case RSS_2:
dbFeed = database.feedDao().getFeedByUrl(((RSSFeed) feed).getChannel().getFeedUrl()); dbFeed = database.feedDao().getFeedByUrl(((RSSFeed) feed).getChannel().getFeedUrl(), account.getId());
items = ItemMatcher.itemsFromRSS(((RSSFeed) feed).getChannel().getItems(), dbFeed); items = ItemMatcher.itemsFromRSS(((RSSFeed) feed).getChannel().getItems(), dbFeed);
break; break;
case RSS_ATOM: case RSS_ATOM:
dbFeed = database.feedDao().getFeedByUrl(((ATOMFeed) feed).getUrl()); dbFeed = database.feedDao().getFeedByUrl(((ATOMFeed) feed).getUrl(), account.getId());
items = ItemMatcher.itemsFromATOM(((ATOMFeed) feed).getEntries(), dbFeed); items = ItemMatcher.itemsFromATOM(((ATOMFeed) feed).getEntries(), dbFeed);
break; break;
case RSS_JSON: case RSS_JSON:
dbFeed = database.feedDao().getFeedByUrl(((JSONFeed) feed).getFeedUrl()); dbFeed = database.feedDao().getFeedByUrl(((JSONFeed) feed).getFeedUrl(), account.getId());
items = ItemMatcher.itemsFromJSON(((JSONFeed) feed).getItems(), dbFeed); items = ItemMatcher.itemsFromJSON(((JSONFeed) feed).getItems(), dbFeed);
break; break;
} }