fix crash when Account.displayName is null (#1667)
This commit is contained in:
parent
fde23f25d2
commit
88b8eca16a
4 changed files with 5 additions and 5 deletions
|
@ -31,7 +31,7 @@ data class Account(
|
|||
val id: String,
|
||||
@SerializedName("username") val localUsername: String,
|
||||
@SerializedName("acct") val username: String,
|
||||
@SerializedName("display_name") val displayName: String,
|
||||
@SerializedName("display_name") val displayName: String?, // should never be null per Api definition, but some servers break the contract
|
||||
val note: @WriteWith<SpannedParceler>() Spanned,
|
||||
val url: String,
|
||||
val avatar: String,
|
||||
|
@ -49,7 +49,7 @@ data class Account(
|
|||
) : Parcelable {
|
||||
|
||||
val name: String
|
||||
get() = if (displayName.isEmpty()) {
|
||||
get() = if (displayName.isNullOrEmpty()) {
|
||||
localUsername
|
||||
} else displayName
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue