From 1052b453a873c4538119688a8e6f12136ed61021 Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Mon, 10 Feb 2020 17:46:18 +0100
Subject: [PATCH] Fix feed being null when there is only one new item for sync
 result notification

---
 app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt | 3 ++-
 .../src/main/java/com/readrops/readropsdb/dao/FeedDao.java     | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt b/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt
index cf567325..c15b9ce4 100644
--- a/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt
+++ b/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt
@@ -5,6 +5,7 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.readrops.app.R
+import com.readrops.readropsdb.Database
 import com.readrops.readropsdb.entities.account.Account
 import com.readrops.readropslibrary.services.SyncResult
 
@@ -39,7 +40,7 @@ class SyncResultAnalyser(val context: Context, private val syncResults: Map<Acco
                     contentText = context.getString(R.string.new_items, syncResult.items.size.toString())
                     largeIcon = BitmapFactory.decodeResource(context.resources, account.accountType.iconRes)
                 } else if (feedsIdsForNewItems.size == 1) { // new items from only one feed from one account
-                    val feed = syncResult.feeds.find { it.id == feedsIdsForNewItems.first() }
+                    val feed = Database.getInstance(context).feedDao().getFeedById(feedsIdsForNewItems.first())
                     title = feed?.name
                     contentText = syncResult.items.first().title
 
diff --git a/readropsdb/src/main/java/com/readrops/readropsdb/dao/FeedDao.java b/readropsdb/src/main/java/com/readrops/readropsdb/dao/FeedDao.java
index 2bf10209..e8e809b6 100644
--- a/readropsdb/src/main/java/com/readrops/readropsdb/dao/FeedDao.java
+++ b/readropsdb/src/main/java/com/readrops/readropsdb/dao/FeedDao.java
@@ -25,6 +25,9 @@ public abstract class FeedDao implements BaseDao<Feed> {
     @Query("Select * from Feed Order By name ASC")
     public abstract LiveData<List<Feed>> getAllFeeds();
 
+    @Query("Select * from Feed Where id = :feedId")
+    public abstract Feed getFeedById(int feedId);
+
     @Query("Select case When :feedUrl In (Select url from Feed Where account_id = :accountId) Then 1 else 0 end")
     public abstract boolean feedExists(String feedUrl, int accountId);