FreshRSS/Readrops
1
0
Fork 0
mirror of https://github.com/readrops/Readrops.git synced 2025-02-06 13:33:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix feeds being deleted when adding a new feed with a NC News account

Browse Source
This commit is contained in:
Shinokuni 2020-04-09 21:20:19 +02:00
parent 66616b5759
commit 0d520e3c1f
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java
View File

@ -12,10 +12,10 @@ import com.readrops.app.database.entities.Folder;
import com.readrops.app.database.entities.Item;
import com.readrops.app.database.entities.account.Account;
import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.matchers.FeedMatcher;
import com.readrops.app.utils.matchers.ItemMatcher;
import com.readrops.app.utils.ParsingResult;
import com.readrops.app.utils.Utils;
import com.readrops.app.utils.matchers.FeedMatcher;
import com.readrops.app.utils.matchers.ItemMatcher;
import com.readrops.readropslibrary.services.SyncType;
import com.readrops.readropslibrary.services.nextcloudnews.NextNewsAPI;
import com.readrops.readropslibrary.services.nextcloudnews.NextNewsSyncData;
@ -115,7 +115,7 @@ public class NextNewsRepository extends ARepository<NextNewsAPI> {
insertFolders(syncResult.getFolders());
timings.addSplit("insert folders");
insertFeeds(syncResult.getFeeds());
insertFeeds(syncResult.getFeeds(), false);
timings.addSplit("insert feeds");
insertItems(syncResult.getItems(), syncType == SyncType.INITIAL_SYNC);
@ -149,7 +149,7 @@ public class NextNewsRepository extends ARepository<NextNewsAPI> {
NextNewsFeeds nextNewsFeeds = api.createFeed(result.getUrl(), 0);
if (nextNewsFeeds != null) {
List<Feed> newFeeds = insertFeeds(nextNewsFeeds.getFeeds());
List<Feed> newFeeds = insertFeeds(nextNewsFeeds.getFeeds(), true);
// there is always only one object in the list, see nextcloud news api doc
insertionResult.setFeed(newFeeds.get(0));
} else
@ -268,14 +268,19 @@ public class NextNewsRepository extends ARepository<NextNewsAPI> {
}).andThen(super.deleteFolder(folder));
}
private List<Feed> insertFeeds(List<NextNewsFeed> nextNewsFeeds) {
private List<Feed> insertFeeds(List<NextNewsFeed> nextNewsFeeds, boolean newFeeds) {
List<Feed> feeds = new ArrayList<>();
for (NextNewsFeed nextNewsFeed : nextNewsFeeds) {
feeds.add(FeedMatcher.nextNewsFeedToFeed(nextNewsFeed, account));
}
List<Long> insertedFeedsIds = database.feedDao().feedsUpsert(feeds, account);
List<Long> insertedFeedsIds;
if (newFeeds) {
insertedFeedsIds = database.feedDao().insert(feeds);
} else {
insertedFeedsIds = database.feedDao().feedsUpsert(feeds, account);
}
List<Feed> insertedFeeds = new ArrayList<>();
if (!insertedFeedsIds.isEmpty()) {

2
app/src/main/java/com/readrops/app/utils/matchers/FeedMatcher.java
View File

@ -21,7 +21,7 @@ public final class FeedMatcher {
newFeed.setSiteUrl(feed.getLink());
newFeed.setUnreadCount(feed.getUnreadCount());
newFeed.setFolderId(feed.getFolderId());
newFeed.setFolderId(feed.getFolderId() > 0 ? feed.getFolderId() : null);
newFeed.setIconUrl(feed.getFaviconLink());
newFeed.setRemoteId(String.valueOf(feed.getId()));