Fixes "null" strings on profile fields.

vitorpamplona · Nov 27, 2024 · 9a0c998 · 9a0c998
1 parent 88082b1
commit 9a0c998
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...hyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt b/...hyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt
@@ -1016,7 +1016,7 @@ private fun DrawAdditionalInfo(
                 fontSize = 25.sp,
             )
             Spacer(StdHorzSpacer)
-            user.info?.pronouns.let {
+            user.info?.pronouns?.let {
                 Text(
                     text = "($it)",
                     modifier = Modifier,

diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/ContactListEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/ContactListEvent.kt
@@ -465,6 +465,8 @@ class UserMetadata {
     fun profilePicture(): String? = picture
 
     fun cleanBlankNames() {
+        if (pronouns == "null") pronouns = null
+
         if (picture?.isNotEmpty() == true) picture = picture?.trim()
         if (nip05?.isNotEmpty() == true) nip05 = nip05?.trim()
         if (displayName?.isNotEmpty() == true) displayName = displayName?.trim()

diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/MetadataEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/MetadataEvent.kt
@@ -283,7 +283,7 @@ class MetadataEvent(
             key: String,
             value: String,
         ) {
-            if (value.isBlank()) {
+            if (value.isBlank() || value == "null") {
                 currentJson.remove(key)
             } else {
                 currentJson.put(key, value.trim())