sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-19 20:29:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix chat message deserializing

Browse source
This commit is contained in:
Phillip Thelen 2018-11-09 18:14:54 +01:00
parent e4b58d9cb7
commit dd9d068daf
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Habitica/res/layout/fragment_inbox_message_list.xml
View file

@ -2,8 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
android:layout_height="match_parent">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"

16
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
View file

@ -158,9 +158,19 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection<ChatMessage>?, autoUp
if (messageWasSent()) {
userLabel.tier = user?.contributor?.level ?: 0
userLabel.username = name
if (user?.username != null && releasedUsernames) {
sublineTextView.text = "@${user?.username} ∙ ${msg.getAgoString(res)}"
} else {
sublineTextView.text = msg.getAgoString(res)
}
} else {
userLabel.tier = msg.contributor?.level ?: 0
userLabel.username = msg.user
if (msg.username != null && releasedUsernames) {
sublineTextView.text = "${msg.formattedUsername} ∙ ${msg.getAgoString(res)}"
} else {
sublineTextView.text = msg.getAgoString(res)
}
}
when {
userLabel.tier == 8 -> {
@ -216,12 +226,6 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection<ChatMessage>?, autoUp
}
messageWrapper.setScaledPadding(context, 8, 8, 8, 8)
if (msg.username != null && releasedUsernames) {
sublineTextView.text = "${msg.formattedUsername} ∙ ${msg.getAgoString(res)}"
} else {
sublineTextView.text = msg.getAgoString(res)
}
if (expandedMessageId == msg.id) {
buttonsWrapper.visibility = View.VISIBLE
deleteButton.visibility = if (shouldShowDelete()) View.VISIBLE else View.GONE

2
Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.kt
View file

@ -61,7 +61,7 @@ class ChatMessageDeserializer : JsonDeserializer<ChatMessage> {
message.user = obj.get("user").asString
}
if (obj.has("username")) {
if (obj.has("username") && obj.get("username").isJsonPrimitive) {
message.username = obj.get("username").asString
}