Browse Source

Avoid using displayName for displaying purpose (#2101)

pull/2104/head
kyori19 5 years ago committed by GitHub
parent
commit
cf642d9eb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt
  2. 2
      app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt
  3. 2
      app/src/main/java/com/keylesspalace/tusky/util/ViewDataUtils.java

2
app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt

@ -167,7 +167,7 @@ fun Account.toEntity() =
ConversationAccountEntity(
id,
username,
displayName.orEmpty(),
name,
avatar,
emojis ?: emptyList()
)

2
app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt

@ -298,7 +298,7 @@ fun Account.toEntity(accountId: Long, gson: Gson): TimelineAccountEntity {
timelineUserId = accountId,
localUsername = localUsername,
username = username,
displayName = displayName.orEmpty(),
displayName = name,
url = url,
avatar = avatar,
emojis = gson.toJson(emojis),

2
app/src/main/java/com/keylesspalace/tusky/util/ViewDataUtils.java

@ -52,7 +52,7 @@ public final class ViewDataUtils {
.setSensitive(visibleStatus.getSensitive())
.setIsShowingSensitiveContent(alwaysShowSensitiveMedia || !visibleStatus.getSensitive())
.setSpoilerText(visibleStatus.getSpoilerText())
.setRebloggedByUsername(status.getReblog() == null ? null : status.getAccount().getDisplayName())
.setRebloggedByUsername(status.getReblog() == null ? null : status.getAccount().getName())
.setUserFullName(visibleStatus.getAccount().getName())
.setVisibility(visibleStatus.getVisibility())
.setSenderId(visibleStatus.getAccount().getId())

Loading…
Cancel
Save