summaryrefslogtreecommitdiff
path: root/app/src/main/java/org/terst/feedreader/ui/AddFeedScreen.kt
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/org/terst/feedreader/ui/AddFeedScreen.kt')
-rw-r--r--app/src/main/java/org/terst/feedreader/ui/AddFeedScreen.kt7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/java/org/terst/feedreader/ui/AddFeedScreen.kt b/app/src/main/java/org/terst/feedreader/ui/AddFeedScreen.kt
index 066d8d9..e531fb7 100644
--- a/app/src/main/java/org/terst/feedreader/ui/AddFeedScreen.kt
+++ b/app/src/main/java/org/terst/feedreader/ui/AddFeedScreen.kt
@@ -68,8 +68,11 @@ fun AddFeedScreen(onDone: () -> Unit) {
// (and etag/lastModified/lastError) back to defaults on every re-import.
// Preserve the existing row's other fields; only title/siteUrl come from OPML.
val existing = db.feedDao().getById(feed.xmlUrl)
- val entity = existing?.copy(title = feed.title, siteUrl = feed.htmlUrl ?: existing.siteUrl)
- ?: FeedEntity(id = feed.xmlUrl, title = feed.title, siteUrl = feed.htmlUrl)
+ val entity = existing?.copy(
+ title = feed.title,
+ siteUrl = feed.htmlUrl ?: existing.siteUrl,
+ folder = feed.folder ?: existing.folder
+ ) ?: FeedEntity(id = feed.xmlUrl, title = feed.title, siteUrl = feed.htmlUrl, folder = feed.folder)
db.feedDao().upsert(entity)
}
FeedFetchWorker.fetchNow(context)