From a1fca572a30fd84f2a0b45898227f4a0404fc6c3 Mon Sep 17 00:00:00 2001
From: Amirhossein <amirhossein.naghshzan@savoirfairelinux.com>
Date: Fri, 24 Sep 2021 16:21:04 -0400
Subject: [PATCH] tv: update conversation adapter
Change-Id: I7bd0a6daad83277b7c0a537bfa93ec002e4376fc
---
.../ring/tv/conversation/TvConversationAdapter.kt | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/tv/conversation/TvConversationAdapter.kt b/ring-android/app/src/main/java/cx/ring/tv/conversation/TvConversationAdapter.kt
index a423b59ea..f858e09bb 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/conversation/TvConversationAdapter.kt
+++ b/ring-android/app/src/main/java/cx/ring/tv/conversation/TvConversationAdapter.kt
@@ -660,11 +660,14 @@ class TvConversationAdapter(
private fun configureForContactEvent(viewHolder: ConversationViewHolder, interaction: Interaction) {
val event = interaction as ContactEvent
- if (event.event === ContactEvent.Event.ADDED) {
- viewHolder.mMsgTxt?.setText(R.string.hist_contact_added)
- } else if (event.event === ContactEvent.Event.INCOMING_REQUEST) {
- viewHolder.mMsgTxt?.setText(R.string.hist_invitation_received)
- }
+ viewHolder.mMsgTxt?.setText(when (event.event) {
+ ContactEvent.Event.ADDED -> R.string.hist_contact_added
+ ContactEvent.Event.INVITED -> R.string.hist_contact_invited
+ ContactEvent.Event.REMOVED -> R.string.hist_contact_left
+ ContactEvent.Event.BANNED -> R.string.hist_contact_banned
+ ContactEvent.Event.INCOMING_REQUEST -> R.string.hist_invitation_received
+ else -> R.string.hist_contact_added
+ })
viewHolder.compositeDisposable.add(timestampUpdateTimer.subscribe { t: Long? ->
val timeSeparationString = TextUtils.timestampToDetailString(viewHolder.itemView.context, event.timestamp)
viewHolder.mMsgDetailTxt?.text = timeSeparationString
--
GitLab