Skip to content

Fix/cmm 954 reader when editing a comment markup tags are shown #22371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
+23 −7
Open

Fix/cmm 954 reader when editing a comment markup tags are shown #22371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0be8b28
Showing plain text
adalpari Nov 27, 2025
f297e84
Fixing tests
adalpari Nov 27, 2025
263205c
Simplifying the check
adalpari Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...s/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsEditViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import org.wordpress.android.ui.notifications.utils.NotificationsActionsWrapper
import org.wordpress.android.ui.pages.SnackbarMessageHolder
import org.wordpress.android.ui.utils.UiString
import org.wordpress.android.ui.utils.UiString.UiStringRes
import org.wordpress.android.util.HtmlCompatWrapper
import org.wordpress.android.util.NetworkUtilsWrapper
import org.wordpress.android.util.analytics.AnalyticsUtils.AnalyticsCommentActionSource
import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
Expand All @@ -55,7 +56,8 @@ class UnifiedCommentsEditViewModel @Inject constructor(
private val getCommentUseCase: GetCommentUseCase,
private val notificationActionsWrapper: NotificationsActionsWrapper,
private val readerCommentTableWrapper: ReaderCommentTableWrapper,
private val analyticsUtilsWrapper: AnalyticsUtilsWrapper
private val analyticsUtilsWrapper: AnalyticsUtilsWrapper,
private val htmlCompatWrapper: HtmlCompatWrapper
) : ScopedViewModel(mainDispatcher) {
private val _uiState = MutableLiveData<EditCommentUiState>()
private val _uiActionEvent = MutableLiveData<Event<EditCommentActionEvent>>()
Expand Down Expand Up @@ -239,7 +241,7 @@ class UnifiedCommentsEditViewModel @Inject constructor(
CommentEssentials(
commentId = commentEntity.id,
userName = commentEntity.authorName ?: "",
commentText = commentEntity.content ?: "",
commentText = htmlToPlainText(commentEntity.content ?: ""),
userUrl = commentEntity.authorUrl ?: "",
userEmail = commentEntity.authorEmail ?: "",
isFromRegisteredUser = commentEntity.authorId > 0
Expand All @@ -249,6 +251,10 @@ class UnifiedCommentsEditViewModel @Inject constructor(
}
}

private fun htmlToPlainText(html: String): String {
return htmlCompatWrapper.fromHtml(html).toString().trim()
}

private suspend fun updateComment(editedCommentEssentials: CommentEssentials) {
val commentEntity =
commentsStore.getCommentByLocalSiteAndRemoteId(site.id, commentIdentifier.remoteCommentId).firstOrNull()
Expand Down
20 changes: 15 additions & 5 deletions ...est/java/org/wordpress/android/ui/comments/viewmodels/UnifiedCommentsEditViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import org.wordpress.android.ui.comments.unified.usecase.GetCommentUseCase
import org.wordpress.android.ui.notifications.utils.NotificationsActionsWrapper
import org.wordpress.android.ui.pages.SnackbarMessageHolder
import org.wordpress.android.ui.utils.UiString.UiStringRes
import org.wordpress.android.util.HtmlCompatWrapper
import org.wordpress.android.util.NetworkUtilsWrapper
import org.wordpress.android.util.analytics.AnalyticsUtils.AnalyticsCommentActionSource
import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
Expand Down Expand Up @@ -73,6 +74,9 @@ class UnifiedCommentsEditViewModelTest : BaseUnitTest() {
@Mock
lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper

@Mock
lateinit var htmlCompatWrapper: HtmlCompatWrapper

private lateinit var viewModel: UnifiedCommentsEditViewModel

private var uiState: MutableList<EditCommentUiState> = mutableListOf()
Expand Down Expand Up @@ -102,6 +106,9 @@ class UnifiedCommentsEditViewModelTest : BaseUnitTest() {
whenever(readerCommentTableWrapper.getComment(REMOTE_SITE_ID, postId, remoteCommentId))
.thenReturn(READER_COMMENT_ENTITY)

whenever(htmlCompatWrapper.fromHtml(any(), any()))
.thenReturn(COMMENT_CONTENT_PLAIN)

viewModel = UnifiedCommentsEditViewModel(
mainDispatcher = testDispatcher(),
bgDispatcher = testDispatcher(),
Expand All @@ -112,7 +119,8 @@ class UnifiedCommentsEditViewModelTest : BaseUnitTest() {
getCommentUseCase = getCommentUseCase,
notificationActionsWrapper = notificationActionsWrapper,
readerCommentTableWrapper = readerCommentTableWrapper,
analyticsUtilsWrapper
analyticsUtilsWrapper = analyticsUtilsWrapper,
htmlCompatWrapper = htmlCompatWrapper
)

setupObservers()
Expand Down Expand Up @@ -503,6 +511,8 @@ class UnifiedCommentsEditViewModelTest : BaseUnitTest() {
companion object {
private const val LOCAL_SITE_ID = 123
private const val REMOTE_SITE_ID = 456L
private const val COMMENT_CONTENT_HTML = "<p>content</p>"
private const val COMMENT_CONTENT_PLAIN = "content"

private val COMMENT_ENTITY = CommentEntity(
id = 1000,
Expand All @@ -519,7 +529,7 @@ class UnifiedCommentsEditViewModelTest : BaseUnitTest() {
status = null,
datePublished = null,
publishedTimestamp = 0,
content = "content",
content = COMMENT_CONTENT_HTML,
url = null,
hasParent = false,
parentId = 0,
Expand All @@ -541,7 +551,7 @@ class UnifiedCommentsEditViewModelTest : BaseUnitTest() {
status = null,
datePublished = null,
publishedTimestamp = 0,
content = "content",
content = COMMENT_CONTENT_HTML,
url = null,
hasParent = false,
parentId = 0,
Expand All @@ -553,13 +563,13 @@ class UnifiedCommentsEditViewModelTest : BaseUnitTest() {
authorUrl = "authorUrl"
authorName = "authorName"
authorEmail = "authorEmail"
text = "content"
text = COMMENT_CONTENT_PLAIN
}

private val COMMENT_ESSENTIALS = CommentEssentials(
commentId = COMMENT_ENTITY.id,
userName = COMMENT_ENTITY.authorName!!,
commentText = COMMENT_ENTITY.content!!,
commentText = COMMENT_CONTENT_PLAIN,
userUrl = COMMENT_ENTITY.authorUrl!!,
userEmail = COMMENT_ENTITY.authorEmail!!
)
Expand Down