From cc5e8f35a73eedf1d55c5635310697e91dafc038 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Tue, 29 Mar 2022 16:25:01 +0200
Subject: [PATCH] Improves code formatting

---
 .../app/features/home/room/detail/TimelineFragment.kt       | 2 +-
 .../home/room/detail/timeline/item/MessageAudioItem.kt      | 6 +++---
 .../home/room/detail/timeline/item/MessageVoiceItem.kt      | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index a5c1b8a544..db86b5a55d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -1193,7 +1193,7 @@ class TimelineFragment @Inject constructor(
         val nonFormattedBody = when (messageContent) {
             is MessageAudioContent -> getAudioContentBodyText(messageContent)
             is MessagePollContent  -> messageContent.getBestPollCreationInfo()?.question?.getBestQuestion()
-            else                   -> messageContent?.body ?: ""
+            else                   -> messageContent?.body.orEmpty()
         }
         var formattedBody: CharSequence? = null
         if (messageContent is MessageTextContent && messageContent.format == MessageFormat.FORMAT_MATRIX_HTML) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt
index 243aa8c6a4..7748ccb03f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt
@@ -74,13 +74,13 @@ abstract class MessageAudioItem : AbsMessageItem<MessageAudioItem.Holder>() {
     }
 
     private fun bindUploadState(holder: Holder) {
-        if (!attributes.informationData.sendState.hasFailed()) {
-            contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, isLocalFile, holder.progressLayout)
-        } else {
+        if (attributes.informationData.sendState.hasFailed()) {
             holder.audioPlaybackControlButton.setImageResource(R.drawable.ic_cross)
             holder.audioPlaybackControlButton.contentDescription =
                     holder.view.context.getString(R.string.error_audio_message_unable_to_play, filename)
             holder.progressLayout.isVisible = false
+        } else {
+            contentUploadStateTrackerBinder.bind(attributes.informationData.eventId, isLocalFile, holder.progressLayout)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
index d66b9445f5..8da4a3dcd8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
@@ -58,10 +58,6 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
     @JvmField
     var isLocalFile = false
 
-    @EpoxyAttribute
-    @JvmField
-    var isDownloaded = false
-
     @EpoxyAttribute
     lateinit var contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder