From 510e2d5b88f269663efb68e43262860ffacce028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 25 Dec 2022 04:40:58 +0100
Subject: [PATCH] Fix html entities parsing in school announcements (#2086)

---
 app/build.gradle                                       |  1 +
 .../schoolannouncement/SchoolAnnouncementAdapter.kt    |  4 ++--
 .../schoolannouncement/SchoolAnnouncementDialog.kt     |  4 ++--
 .../java/io/github/wulkanowy/utils/StringExtension.kt  | 10 +++++++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e2e6dae49..8409574e5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -240,6 +240,7 @@ dependencies {
     implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
+    implementation 'org.apache.commons:commons-text:1.10.0'
 
     playImplementation platform('com.google.firebase:firebase-bom:31.1.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
index 62f6251ec..46999599b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
@@ -2,10 +2,10 @@ package io.github.wulkanowy.ui.modules.schoolannouncement
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.text.parseAsHtml
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.databinding.ItemSchoolAnnouncementBinding
+import io.github.wulkanowy.utils.parseUonetHtml
 import io.github.wulkanowy.utils.toFormattedString
 import javax.inject.Inject
 
@@ -28,7 +28,7 @@ class SchoolAnnouncementAdapter @Inject constructor() :
         with(holder.binding) {
             schoolAnnouncementItemDate.text = item.date.toFormattedString()
             schoolAnnouncementItemType.text = item.subject
-            schoolAnnouncementItemContent.text = item.content.parseAsHtml()
+            schoolAnnouncementItemContent.text = item.content.parseUonetHtml()
 
             root.setOnClickListener { onItemClickListener(item) }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
index 0a71afef1..e33a48f03 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
@@ -5,11 +5,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.databinding.DialogSchoolAnnouncementBinding
 import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.utils.parseUonetHtml
 import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 
@@ -46,7 +46,7 @@ class SchoolAnnouncementDialog : DialogFragment() {
         with(binding) {
             announcementDialogSubjectValue.text = announcement.subject
             announcementDialogDateValue.text = announcement.date.toFormattedString()
-            announcementDialogDescriptionValue.text = announcement.content.parseAsHtml()
+            announcementDialogDescriptionValue.text = announcement.content.parseUonetHtml()
 
             announcementDialogClose.setOnClickListener { dismiss() }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt
index bddd7df4c..8043e3659 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt
@@ -1,7 +1,15 @@
 package io.github.wulkanowy.utils
 
+import androidx.core.text.parseAsHtml
+import org.apache.commons.text.StringEscapeUtils
+
 inline fun String?.ifNullOrBlank(defaultValue: () -> String) =
     if (isNullOrBlank()) defaultValue() else this
 
 fun String.capitalise() =
-    replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
\ No newline at end of file
+    replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
+
+fun String.parseUonetHtml() = this
+    .let(StringEscapeUtils::unescapeHtml4)
+    .replace("\n", "<br/>")
+    .parseAsHtml()