Mastodon/SubwayTooter-Android-App
1
0
Fork 0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-02-01 11:26:48 +01:00
Code Issues Releases Wiki Activity

ログインフォームで short_description もHTMLデコードする

Browse Source
This commit is contained in:
tateisu 2023-01-19 12:11:50 +09:00
parent aa97c18891
commit ae67fe6dae
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/jp/juggler/subwaytooter/dialog/LoginForm.kt
View File

@ -243,14 +243,17 @@ class LoginForm(
}
else -> {
textColor = attrColor(R.attr.colorTextContent)
text = tootInstance.short_description.notBlank()
?: DecodeOptions(
applicationContext,
LinkHelper.create(tootInstance),
forceHtml = true,
short = true,
).decodeHTML(tootInstance.description)
.replace("""\n[\s\n]+""".toRegex(),"\n")
text = (tootInstance.short_description.notBlank()
?: tootInstance.description.notBlank()
?: "(empty server description)"
).let {
DecodeOptions(
applicationContext,
LinkHelper.create(tootInstance),
forceHtml = true,
short = true,
).decodeHTML(it)
}.replace("""\n[\s\n]+""".toRegex(), "\n")
}
}
}