fix: mapping error

Author: PavloNetrebchuk

core/src/main/java/org/openedx/core/extension/TextConverter.kt

@@ -1,8 +1,6 @@
 package org.openedx.core.extension
 
-import android.os.Parcelable
 import android.util.Patterns
-import kotlinx.parcelize.Parcelize
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.select.Elements
@@ -36,84 +34,10 @@ object TextConverter : KoinComponent {
         return LinkedText(text, linksMap.toMap())
     }
 
-    fun textToLinkedImageText(html: String): LinkedImageText {
-        val doc: Document =
-            Jsoup.parse(html)
-        val links: Elements = doc.select("a[href]")
-        var text = doc.text()
-        val headers = getHeaders(doc)
-        val linksMap = mutableMapOf<String, String>()
-        for (link in links) {
-            if (isLinkValid(link.attr("href"))) {
-                val linkText = if (link.hasText()) link.text() else link.attr("href")
-                linksMap[linkText] = link.attr("href")
-            } else {
-                val resultLink =
-                    if (link.attr("href").isNotEmpty() && link.attr("href")[0] == '/') {
-                        link.attr("href").substring(1)
-                    } else {
-                        link.attr("href")
-                    }
-                if (resultLink.isNotEmpty() && isLinkValid(config.getApiHostURL() + resultLink)) {
-                    linksMap[link.text()] = config.getApiHostURL() + resultLink
-                }
-            }
-        }
-        text = setSpacesForHeaders(text, headers)
-        return LinkedImageText(
-            text,
-            linksMap.toMap(),
-            getImageLinks(doc),
-            headers
-        )
-    }
-
     fun isLinkValid(link: String) = Patterns.WEB_URL.matcher(link.lowercase()).matches()
-
-    @Suppress("MagicNumber")
-    private fun getHeaders(document: Document): List<String> {
-        val headersList = mutableListOf<String>()
-        for (index in 1..6) {
-            if (document.select("h$index").hasText()) {
-                headersList.add(document.select("h$index").text())
-            }
-        }
-        return headersList.toList()
-    }
-
-    private fun setSpacesForHeaders(text: String, headers: List<String>): String {
-        var result = text
-        headers.forEach {
-            val startIndex = text.indexOf(it)
-            val endIndex = startIndex + it.length + 1
-            result = text.replaceRange(startIndex, endIndex, it + "\n")
-        }
-        return result
-    }
-
-    private fun getImageLinks(document: Document): Map<String, String> {
-        val imageLinks = mutableMapOf<String, String>()
-        val elements = document.getElementsByTag("img")
-        for (element in elements) {
-            if (element.hasAttr("alt")) {
-                imageLinks[element.attr("alt")] = element.attr("src")
-            } else {
-                imageLinks[element.attr("src")] = element.attr("src")
-            }
-        }
-        return imageLinks.toMap()
-    }
 }
 
 data class LinkedText(
     val text: String,
     val links: Map<String, String>
 )
-
-@Parcelize
-data class LinkedImageText(
-    val text: String,
-    val links: Map<String, String>,
-    val imageLinks: Map<String, String>,
-    val headers: List<String>
-) : Parcelable

discussion/src/main/java/org/openedx/discussion/data/model/response/CommentsResponse.kt

@@ -3,7 +3,6 @@ package org.openedx.discussion.data.model.response
 import com.google.gson.annotations.SerializedName
 import org.openedx.core.data.model.Pagination
 import org.openedx.core.data.model.ProfileImage
-import org.openedx.core.extension.TextConverter
 import org.openedx.discussion.domain.model.CommentsData
 import org.openedx.discussion.domain.model.DiscussionComment
 
@@ -78,7 +77,6 @@ data class CommentResult(
             updatedAt,
             rawBody,
             renderedBody,
-            TextConverter.textToLinkedImageText(renderedBody),
             abuseFlagged,
             voted,
             voteCount,

discussion/src/main/java/org/openedx/discussion/data/model/response/ThreadsResponse.kt

@@ -3,7 +3,6 @@ package org.openedx.discussion.data.model.response
 import com.google.gson.annotations.SerializedName
 import org.openedx.core.data.model.Pagination
 import org.openedx.core.data.model.ProfileImage
-import org.openedx.core.extension.TextConverter
 import org.openedx.discussion.domain.model.DiscussionType
 import org.openedx.discussion.domain.model.ThreadsData
 
@@ -104,7 +103,6 @@ data class ThreadsResponse(
                 updatedAt,
                 rawBody,
                 renderedBody,
-                TextConverter.textToLinkedImageText(renderedBody),
                 abuseFlagged,
                 voted,
                 voteCount,

discussion/src/main/java/org/openedx/discussion/domain/model/DiscussionComment.kt

@@ -3,7 +3,6 @@ package org.openedx.discussion.domain.model
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 import org.openedx.core.domain.model.ProfileImage
-import org.openedx.core.extension.LinkedImageText
 
 @Parcelize
 data class DiscussionComment(
@@ -14,7 +13,6 @@ data class DiscussionComment(
     val updatedAt: String,
     val rawBody: String,
     val renderedBody: String,
-    val parsedRenderedBody: LinkedImageText,
     val abuseFlagged: Boolean,
     val voted: Boolean,
     val voteCount: Int,

discussion/src/main/java/org/openedx/discussion/domain/model/Thread.kt

@@ -3,7 +3,6 @@ package org.openedx.discussion.domain.model
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 import org.openedx.core.domain.model.ProfileImage
-import org.openedx.core.extension.LinkedImageText
 import org.openedx.discussion.R
 
 @Parcelize
@@ -15,7 +14,6 @@ data class Thread(
     val updatedAt: String,
     val rawBody: String,
     val renderedBody: String,
-    val parsedRenderedBody: LinkedImageText,
     val abuseFlagged: Boolean,
     val voted: Boolean,
     val voteCount: Int,

discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt

@@ -72,7 +72,6 @@ import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.openedx.core.domain.model.ProfileImage
-import org.openedx.core.extension.TextConverter
 import org.openedx.core.ui.BackBtn
 import org.openedx.core.ui.HandleUIMessage
 import org.openedx.core.ui.displayCutoutForLandscape
@@ -550,7 +549,6 @@ private val mockThread = org.openedx.discussion.domain.model.Thread(
     "",
     "",
     "",
-    TextConverter.textToLinkedImageText(""),
     false,
     true,
     20,
@@ -585,7 +583,6 @@ private val mockComment = DiscussionComment(
     "",
     "",
     "",
-    TextConverter.textToLinkedImageText(""),
     false,
     true,
     20,

discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt

@@ -76,7 +76,6 @@ import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.openedx.core.domain.model.ProfileImage
-import org.openedx.core.extension.TextConverter
 import org.openedx.core.ui.BackBtn
 import org.openedx.core.ui.HandleUIMessage
 import org.openedx.core.ui.displayCutoutForLandscape
@@ -86,6 +85,7 @@ import org.openedx.core.ui.theme.OpenEdXTheme
 import org.openedx.core.ui.theme.appColors
 import org.openedx.core.ui.theme.appShapes
 import org.openedx.core.ui.theme.appTypography
+import org.openedx.discussion.R
 import org.openedx.discussion.domain.model.DiscussionComment
 import org.openedx.discussion.presentation.DiscussionRouter
 import org.openedx.discussion.presentation.comments.DiscussionCommentsFragment
@@ -218,7 +218,7 @@ private fun DiscussionResponsesScreen(
     val focusManager = LocalFocusManager.current
 
     val firstVisibleIndex = remember {
-        mutableStateOf(scrollState.firstVisibleItemIndex)
+        mutableIntStateOf(scrollState.firstVisibleItemIndex)
     }
     val pullRefreshState =
         rememberPullRefreshState(refreshing = refreshing, onRefresh = { onSwipeRefresh() })
@@ -363,7 +363,7 @@ private fun DiscussionResponsesScreen(
                                                         .padding(horizontal = paddingContent)
                                                         .padding(top = 24.dp, bottom = 8.dp),
                                                     text = pluralStringResource(
-                                                        id = org.openedx.discussion.R.plurals.discussion_comments,
+                                                        id = R.plurals.discussion_comments,
                                                         uiState.mainComment.childCount,
                                                         uiState.mainComment.childCount
                                                     ),
@@ -462,7 +462,7 @@ private fun DiscussionResponsesScreen(
                                             placeholder = {
                                                 Text(
                                                     text = stringResource(
-                                                        id = org.openedx.discussion.R.string.discussion_add_comment
+                                                        id = R.string.discussion_add_comment
                                                     ),
                                                     color = MaterialTheme.appColors.textFieldHint,
                                                     style = MaterialTheme.appTypography.labelLarge,
@@ -493,7 +493,7 @@ private fun DiscussionResponsesScreen(
                                             Icon(
                                                 modifier = Modifier.padding(7.dp),
                                                 painter = painterResource(
-                                                    id = org.openedx.discussion.R.drawable.discussion_ic_send
+                                                    id = R.drawable.discussion_ic_send
                                                 ),
                                                 contentDescription = null,
                                                 tint = iconButtonColor
@@ -591,7 +591,6 @@ private val mockComment = DiscussionComment(
     "",
     "",
     "",
-    TextConverter.textToLinkedImageText(""),
     false,
     true,
     20,

discussion/src/main/java/org/openedx/discussion/presentation/search/DiscussionSearchThreadFragment.kt

@@ -60,7 +60,6 @@ import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.openedx.core.R
-import org.openedx.core.extension.TextConverter
 import org.openedx.core.ui.BackBtn
 import org.openedx.core.ui.HandleUIMessage
 import org.openedx.core.ui.SearchBar
@@ -414,7 +413,6 @@ private val mockThread = org.openedx.discussion.domain.model.Thread(
     "",
     "",
     "",
-    TextConverter.textToLinkedImageText(""),
     false,
     true,
     20,

discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt

@@ -74,7 +74,6 @@ import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.openedx.core.FragmentViewType
-import org.openedx.core.extension.TextConverter
 import org.openedx.core.ui.BackBtn
 import org.openedx.core.ui.HandleUIMessage
 import org.openedx.core.ui.IconText
@@ -742,7 +741,6 @@ private val mockThread = org.openedx.discussion.domain.model.Thread(
     "",
     "",
     "",
-    TextConverter.textToLinkedImageText(""),
     false,
     true,
     20,

discussion/src/main/java/org/openedx/discussion/presentation/ui/DiscussionUI.kt

@@ -45,7 +45,6 @@ import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import org.openedx.core.domain.model.ProfileImage
-import org.openedx.core.extension.TextConverter
 import org.openedx.core.ui.AutoSizeText
 import org.openedx.core.ui.IconText
 import org.openedx.core.ui.RenderHtmlContent
@@ -716,7 +715,6 @@ private val mockComment = DiscussionComment(
     "",
     "",
     "",
-    TextConverter.textToLinkedImageText(""),
     false,
     true,
     20,
@@ -742,7 +740,6 @@ private val mockThread = org.openedx.discussion.domain.model.Thread(
     "",
     "",
     "",
-    TextConverter.textToLinkedImageText(""),
     false,
     true,
     20,