From c7563c938d9df592cd24d16ce4f2cee47285c7ec Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Tue, 2 Apr 2024 09:42:01 -0400
Subject: [PATCH] Minor refactoring

---
 .../com/vitorpamplona/amethyst/model/Account.kt   |  2 +-
 .../amethyst/ui/note/ChatroomMessageCompose.kt    | 14 ++++----------
 .../com/vitorpamplona/amethyst/ui/note/Loaders.kt | 15 ++++-----------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
index 2068e09c5..cb70b75bb 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -2353,7 +2353,7 @@ class Account(
         } else if (event is LnZapRequestEvent && event.isPrivateZap() && isWriteable()) {
             event.cachedPrivateZap()?.content
         } else {
-            event?.content()
+            event.content()
         }
     }
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
index 5e211e07d..11c6472ac 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
@@ -466,13 +466,9 @@ private fun NoteRow(
 ) {
     Row(verticalAlignment = Alignment.CenterVertically) {
         when (note.event) {
-            is ChannelCreateEvent -> {
-                RenderCreateChannelNote(note)
-            }
-            is ChannelMetadataEvent -> {
-                RenderChangeChannelMetadataNote(note)
-            }
-            is DraftEvent -> {
+            is ChannelCreateEvent -> RenderCreateChannelNote(note)
+            is ChannelMetadataEvent -> RenderChangeChannelMetadataNote(note)
+            is DraftEvent ->
                 RenderDraftEvent(
                     note,
                     canPreview,
@@ -483,8 +479,7 @@ private fun NoteRow(
                     accountViewModel,
                     nav,
                 )
-            }
-            else -> {
+            else ->
                 RenderRegularTextNote(
                     note,
                     canPreview,
@@ -493,7 +488,6 @@ private fun NoteRow(
                     accountViewModel,
                     nav,
                 )
-            }
         }
     }
 }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt
index 4ec5f2eac..3379d9025 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt
@@ -25,6 +25,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
@@ -70,19 +71,11 @@ fun LoadDecryptedContentOrNull(
     accountViewModel: AccountViewModel,
     inner: @Composable (String?) -> Unit,
 ) {
-    var decryptedContent by
-        remember(note.event) {
-            mutableStateOf(
-                accountViewModel.cachedDecrypt(note),
-            )
+    val decryptedContent by
+        produceState(initialValue = accountViewModel.cachedDecrypt(note), key1 = note.event?.id()) {
+            accountViewModel.decrypt(note) { value = it }
         }
 
-    if (decryptedContent == null) {
-        LaunchedEffect(key1 = decryptedContent) {
-            accountViewModel.decrypt(note) { decryptedContent = it }
-        }
-    }
-
     inner(decryptedContent)
 }