nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixes "null" strings on profile fields.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-11-27 10:24:09 -05:00
parent 88082b1ba3
commit 9a0c998654
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/ProfileScreen.kt
+1 -1
View File
@@ -1016,7 +1016,7 @@ private fun DrawAdditionalInfo(
fontSize = 25.sp, fontSize = 25.sp,
) )
Spacer(StdHorzSpacer) Spacer(StdHorzSpacer)
user.info?.pronouns.let { user.info?.pronouns?.let {
Text( Text(
text = "($it)", text = "($it)",
modifier = Modifier, modifier = Modifier,
quartz/src/main/java/com/vitorpamplona/quartz/events/ContactListEvent.kt
+2
View File
@@ -465,6 +465,8 @@ class UserMetadata {
fun profilePicture(): String? = picture fun profilePicture(): String? = picture
fun cleanBlankNames() { fun cleanBlankNames() {
if (pronouns == "null") pronouns = null
if (picture?.isNotEmpty() == true) picture = picture?.trim() if (picture?.isNotEmpty() == true) picture = picture?.trim()
if (nip05?.isNotEmpty() == true) nip05 = nip05?.trim() if (nip05?.isNotEmpty() == true) nip05 = nip05?.trim()
if (displayName?.isNotEmpty() == true) displayName = displayName?.trim() if (displayName?.isNotEmpty() == true) displayName = displayName?.trim()
quartz/src/main/java/com/vitorpamplona/quartz/events/MetadataEvent.kt
+1 -1
View File
@@ -283,7 +283,7 @@ class MetadataEvent(
key: String, key: String,
value: String, value: String,
) { ) {
if (value.isBlank()) { if (value.isBlank() || value == "null") {
currentJson.remove(key) currentJson.remove(key)
} else { } else {
currentJson.put(key, value.trim()) currentJson.put(key, value.trim())