Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Fix potential NPE in `ConversationViewHolder` 

`ConversationViewHolder` calls `getDisplayName()`, which may return
null.

Replace with `getName()`, which is consistent with usage in other
classes. Mark `getDisplayName()` as deprecated to prevent future
usage.
This commit is contained in:
Nik Clayton 2023-09-20 11:49:49 +02:00
parent da808793f5
commit 1a817d9b29
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/pachli/components/conversation/ConversationViewHolder.java
View File

@ -81,7 +81,7 @@ public class ConversationViewHolder extends StatusBaseViewHolder {
setupCollapsedState(statusViewData.isCollapsible(), statusViewData.isCollapsed(), statusViewData.isExpanded(), statusViewData.getSpoilerText(), listener);
setDisplayName(account.getDisplayName(), account.getEmojis(), statusDisplayOptions);
setDisplayName(account.getName(), account.getEmojis(), statusDisplayOptions);
setUsername(account.getUsername());
setMetaData(statusViewData, statusDisplayOptions, listener);
setIsReply(status.getInReplyToId() != null);

6
app/src/main/java/app/pachli/entity/TimelineAccount.kt
View File

@ -25,7 +25,10 @@ data class TimelineAccount(
val id: String,
@SerializedName("username") val localUsername: String,
@SerializedName("acct") val username: String,
@SerializedName("display_name") val displayName: String?, // should never be null per Api definition, but some servers break the contract
@Deprecated("prefer the `name` property, which is not-null and not-empty")
@SerializedName("display_name")
val displayName: String?, // should never be null per Api definition, but some servers break the contract
val url: String,
val avatar: String,
val note: String,
@ -33,6 +36,7 @@ data class TimelineAccount(
val emojis: List<Emoji>? = emptyList(), // nullable for backward compatibility
) {
@Suppress("DEPRECATION")
val name: String
get() = if (displayName.isNullOrEmpty()) {
localUsername