From 9f96e84378420fb4ec859f2918d79e8f578c8cd3 Mon Sep 17 00:00:00 2001 From: greenart7c3 <115044884+greenart7c3@users.noreply.github.com> Date: Wed, 28 Jun 2023 07:58:19 -0300 Subject: [PATCH] fix rendering url of highlight note --- .../java/com/vitorpamplona/amethyst/model/LocalCache.kt | 2 ++ .../java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt index 7bb5f3657..da9babb14 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt @@ -51,6 +51,7 @@ object LocalCache { } fun getUserIfExists(key: String): User? { + if (key.isEmpty()) return null return users[key] } @@ -108,6 +109,7 @@ object LocalCache { } private fun isValidHexNpub(key: String): Boolean { + if (key.isBlank()) return false if (key.contains(":")) return false return HexValidator.isHex(key) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt index 0bdd0c86f..8cf04348a 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt @@ -2081,9 +2081,7 @@ fun DisplayHighlight( nav ) - authorHex?.let { - DisplayQuoteAuthor(authorHex, url, nav) - } + DisplayQuoteAuthor(authorHex ?: "", url, nav) } @Composable @@ -2105,7 +2103,7 @@ private fun DisplayQuoteAuthor( } } - Row() { + Row { userBase?.let { userBase -> LoadAndDisplayUser(userBase, nav) }