From 81dc80d19a43f905ed34289a4899c3ea4da32262 Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Fri, 20 Sep 2024 13:07:12 +0200
Subject: [PATCH] Be less strict with feed and folder names (#206)

---
 app/src/main/java/com/readrops/app/feeds/FeedItem.kt        | 4 ++--
 .../java/com/readrops/app/feeds/FolderExpandableItem.kt     | 2 +-
 .../com/readrops/app/timelime/drawer/DrawerFolderItem.kt    | 4 ++--
 .../java/com/readrops/app/timelime/drawer/TimelineDrawer.kt | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/readrops/app/feeds/FeedItem.kt b/app/src/main/java/com/readrops/app/feeds/FeedItem.kt
index 3d96b393..fe2e1057 100644
--- a/app/src/main/java/com/readrops/app/feeds/FeedItem.kt
+++ b/app/src/main/java/com/readrops/app/feeds/FeedItem.kt
@@ -64,14 +64,14 @@ fun FeedItem(
 
             FeedIcon(
                 iconUrl = feed.iconUrl,
-                name = feed.name!!,
+                name = feed.name.orEmpty(),
                 size = 16.dp
             )
 
             ShortSpacer()
 
             Text(
-                text = feed.name!!,
+                text = feed.name.orEmpty(),
                 style = MaterialTheme.typography.bodyMedium,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis
diff --git a/app/src/main/java/com/readrops/app/feeds/FolderExpandableItem.kt b/app/src/main/java/com/readrops/app/feeds/FolderExpandableItem.kt
index 655a5967..7cd6ea81 100644
--- a/app/src/main/java/com/readrops/app/feeds/FolderExpandableItem.kt
+++ b/app/src/main/java/com/readrops/app/feeds/FolderExpandableItem.kt
@@ -84,7 +84,7 @@ fun FolderExpandableItem(
                     MediumSpacer()
 
                     Text(
-                        text = folder.name!!,
+                        text = folder.name.orEmpty(),
                         style = MaterialTheme.typography.bodyLarge,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
diff --git a/app/src/main/java/com/readrops/app/timelime/drawer/DrawerFolderItem.kt b/app/src/main/java/com/readrops/app/timelime/drawer/DrawerFolderItem.kt
index 6b1dc10c..ba2ee660 100644
--- a/app/src/main/java/com/readrops/app/timelime/drawer/DrawerFolderItem.kt
+++ b/app/src/main/java/com/readrops/app/timelime/drawer/DrawerFolderItem.kt
@@ -113,7 +113,7 @@ fun DrawerFolderItem(
                 DrawerFeedItem(
                     label = {
                         Text(
-                            text = feed.name!!,
+                            text = feed.name.orEmpty(),
                             maxLines = 1,
                             overflow = TextOverflow.Ellipsis
                         )
@@ -121,7 +121,7 @@ fun DrawerFolderItem(
                     icon = {
                         FeedIcon(
                             iconUrl = feed.iconUrl,
-                            name = feed.name!!
+                            name = feed.name.orEmpty()
                         )
                     },
                     badge = { Text(feed.unreadCount.toString()) },
diff --git a/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt b/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt
index 2bde42fc..a08d8191 100644
--- a/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt
+++ b/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt
@@ -63,7 +63,7 @@ fun TimelineDrawer(
                     DrawerFolderItem(
                         label = {
                             Text(
-                                text = folder.name!!,
+                                text = folder.name.orEmpty(),
                                 fontWeight = FontWeight.Medium,
                                 maxLines = 1,
                                 overflow = TextOverflow.Ellipsis
@@ -92,7 +92,7 @@ fun TimelineDrawer(
                         DrawerFeedItem(
                             label = {
                                 Text(
-                                    text = feed.name!!,
+                                    text = feed.name.orEmpty(),
                                     maxLines = 1,
                                     overflow = TextOverflow.Ellipsis
                                 )
@@ -100,7 +100,7 @@ fun TimelineDrawer(
                             icon = {
                                 FeedIcon(
                                     iconUrl = feed.iconUrl,
-                                    name = feed.name!!
+                                    name = feed.name.orEmpty()
                                 )
                             },
                             badge = { Text(feed.unreadCount.toString()) },