From 5cdfad968501c6da576d60de228b2ca12538be51 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Fri, 1 Dec 2023 15:40:27 +0200
Subject: [PATCH] Fix edit media caption
---
app/src/main/java/org/futo/circles/view/PreviewPostView.kt | 6 +-----
.../circles/core/extensions/TimelineEventExtensions.kt | 7 ++++++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/org/futo/circles/view/PreviewPostView.kt b/app/src/main/java/org/futo/circles/view/PreviewPostView.kt
index 9534b1430..2d48e7f91 100644
--- a/app/src/main/java/org/futo/circles/view/PreviewPostView.kt
+++ b/app/src/main/java/org/futo/circles/view/PreviewPostView.kt
@@ -72,11 +72,7 @@ class PreviewPostView(
)
}
setOnClickListener { requestFocusOnText() }
-
- binding.ivRemoveImage.setOnClickListener {
- setTextContent()
- }
-
+ binding.ivRemoveImage.setOnClickListener { setTextContent() }
updateContentView()
binding.btnSend.setOnClickListener { listener?.onSendClicked(getPostContent()) }
diff --git a/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt b/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt
index 617838c4a..2f2de08c3 100644
--- a/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt
+++ b/core/src/main/java/org/futo/circles/core/extensions/TimelineEventExtensions.kt
@@ -1,11 +1,16 @@
package org.futo.circles.core.extensions
import org.futo.circles.core.model.PostContentType
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
fun TimelineEvent.getPostContentType(): PostContentType? {
- val messageType = getLastMessageContent()?.msgType
+ val messageType = if (root.getClearType() == EventType.MESSAGE) root.getClearContent()
+ .toModel<MessageContent>()?.msgType
+ else getLastMessageContent()?.msgType
return PostContentType.values().firstOrNull { it.typeKey == messageType }
}
\ No newline at end of file
--
GitLab