fix crash when Account.displayName is null (#1667)

This commit is contained in:
Konrad Pozniak 2020-02-07 20:23:51 +01:00 committed by GitHub
commit 88b8eca16a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions

View file

@ -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