From 7f8d04618a786074aa68572517b94de2b29ca2bd Mon Sep 17 00:00:00 2001
From: davide <davide.crucitti@yahoo.it>
Date: Sun, 14 Aug 2022 12:52:23 +0200
Subject: [PATCH] Simplify local item changes

---
 .../repository/RepositoryImpl.kt              | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
index 56fdfac..cc651d9 100644
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
@@ -147,7 +147,7 @@ class RepositoryImpl(private val api: SelfossApi, private val apiDetails: ApiDet
         val success = api.markAsRead(id.toString())?.isSuccess == true
 
         if (success) {
-            markAsReadLocally(id)
+            markAsReadLocally(items.first {it.id == id})
         }
         return success
     }
@@ -157,7 +157,7 @@ class RepositoryImpl(private val api: SelfossApi, private val apiDetails: ApiDet
         val success = api.unmarkAsRead(id.toString())?.isSuccess == true
 
         if (success) {
-            unmarkAsReadLocally(id)
+            unmarkAsReadLocally(items.first {it.id == id})
         }
         return success
     }
@@ -167,7 +167,7 @@ class RepositoryImpl(private val api: SelfossApi, private val apiDetails: ApiDet
         val success = api.starr(id.toString())?.isSuccess == true
 
         if (success) {
-            starrLocally(id)
+            starrLocally(items.first {it.id == id})
         }
         return success
     }
@@ -177,7 +177,7 @@ class RepositoryImpl(private val api: SelfossApi, private val apiDetails: ApiDet
         val success = api.unstarr(id.toString())?.isSuccess == true
 
         if (success) {
-            unstarrLocally(id)
+            unstarrLocally(items.first {it.id == id})
         }
         return success
     }
@@ -188,41 +188,42 @@ class RepositoryImpl(private val api: SelfossApi, private val apiDetails: ApiDet
         val success = api.markAllAsRead(ids.map { it.toString() })?.isSuccess == true
 
         if (success) {
-            for (id in ids) {
-                markAsReadLocally(id)
+            val itemsToMark = items.filter { it.id in ids }
+            for (item in itemsToMark) {
+                markAsReadLocally(item)
             }
         }
         return success
     }
 
-    private fun markAsReadLocally(id: Int) {
+    private fun markAsReadLocally(item: SelfossModel.Item) {
         // TODO: Mark also in the database
-        if (items.first {it.id == id}.unread) {
-            items.first {it.id == id}.unread = false
+        if (item.unread) {
+            item.unread = false
             badgeUnread -= 1
         }
     }
 
-    private fun unmarkAsReadLocally(id: Int) {
+    private fun unmarkAsReadLocally(item: SelfossModel.Item) {
         // TODO: Mark also in the database
-        if (!items.first {it.id == id}.unread) {
-            items.first {it.id == id}.unread = true
+        if (!item.unread) {
+            item.unread = true
             badgeUnread += 1
         }
     }
 
-    private fun starrLocally(id: Int) {
+    private fun starrLocally(item: SelfossModel.Item) {
         // TODO: Mark also in the database
-        if (!items.first {it.id == id}.starred) {
-            items.first {it.id == id}.starred = true
+        if (!item.starred) {
+            item.starred = true
             badgeStarred += 1
         }
     }
 
-    private fun unstarrLocally(id: Int) {
+    private fun unstarrLocally(item: SelfossModel.Item) {
         // TODO: Mark also in the database
-        if (items.first {it.id == id}.starred) {
-            items.first {it.id == id}.starred = false
+        if (item.starred) {
+            item.starred = false
             badgeStarred -= 1
         }
     }