From 12b2531cda8f3ff01651e9f9268b1c38bf844cda Mon Sep 17 00:00:00 2001
From: Ash <glaxyinfinite@outlook.com>
Date: Sun, 15 May 2022 22:53:05 +0800
Subject: [PATCH] Fix insertIfNotExist foreign key conflict

---
 app/src/main/java/me/ash/reader/data/dao/ArticleDao.kt       | 4 ++--
 app/src/main/java/me/ash/reader/data/repository/RssHelper.kt | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/me/ash/reader/data/dao/ArticleDao.kt b/app/src/main/java/me/ash/reader/data/dao/ArticleDao.kt
index 64b343cb..7cd24182 100644
--- a/app/src/main/java/me/ash/reader/data/dao/ArticleDao.kt
+++ b/app/src/main/java/me/ash/reader/data/dao/ArticleDao.kt
@@ -515,8 +515,8 @@ interface ArticleDao {
         """
         INSERT INTO article
         SELECT :id, :date, :title, :author, :rawDescription, 
-        :shortDescription, :fullContent, :img, :link, :feedId, 
-        :accountId, :isUnread, :isStarred, :isReadLater 
+        :shortDescription, :fullContent, :link, :feedId, 
+        :accountId, :isUnread, :isStarred, :isReadLater, :img
         WHERE NOT EXISTS(SELECT 1 FROM article WHERE link = :link AND accountId = :accountId)
         """
     )
diff --git a/app/src/main/java/me/ash/reader/data/repository/RssHelper.kt b/app/src/main/java/me/ash/reader/data/repository/RssHelper.kt
index 8cbeaa1b..55e1b11e 100644
--- a/app/src/main/java/me/ash/reader/data/repository/RssHelper.kt
+++ b/app/src/main/java/me/ash/reader/data/repository/RssHelper.kt
@@ -96,7 +96,8 @@ class RssHelper @Inject constructor(
                     "RLog",
                     "request rss:\n" +
                             "name: ${feed.name}\n" +
-                            "url: ${feed.url}\n" +
+                            "feedUrl: ${feed.url}\n" +
+                            "url: ${it.link}\n" +
                             "title: ${it.title}\n" +
                             "desc: ${desc}\n" +
                             "content: ${content}\n"