From e7b547acaf2c6f552b65e83bb8f04203d9632557 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Wed, 26 Jun 2024 21:03:30 +0930
Subject: [PATCH] SES-2234 Fix Hide Recovery html dialog

---
 .../java/org/thoughtcrime/securesms/SessionDialogBuilder.kt  | 5 +++--
 app/src/main/res/values/strings.xml                          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index 621014da2e..fa9cb2e475 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -18,7 +18,6 @@ import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.text.HtmlCompat
-import androidx.core.view.setMargins
 import androidx.core.view.updateMargins
 import androidx.fragment.app.Fragment
 import network.loki.messenger.R
@@ -83,7 +82,9 @@ class SessionDialogBuilder(val context: Context) {
         }.let(topView::addView)
     }
 
-    fun htmlText(@StringRes id: Int, @StyleRes style: Int = 0, modify: TextView.() -> Unit = {}) { text(context.resources.getText(id)) }
+    fun htmlText(@StringRes id: Int, @StyleRes style: Int = 0, modify: TextView.() -> Unit = {}) {
+        text(HtmlCompat.fromHtml(context.resources.getString(id), 0))
+    }
 
     fun view(view: View) = contentView.addView(view)
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8a97d54b11..b94eb8bc9e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1086,7 +1086,7 @@
     <string name="notificationsMessage">Message notifications</string>
     <string name="onboardingMessageNotificationExplaination">There are two ways Session can notify you of new messages.</string>
     <string name="recoveryPasswordHidePermanently">Hide Recovery Password Permanently</string>
-    <string name="recoveryPasswordHidePermanentlyDescription1"><![CDATA[Without your recovery password, you cannot load your account on new devices. <br /><br />We strongly recommend you save your recovery password in a safe and secure place before continuing.]]></string>
+    <string name="recoveryPasswordHidePermanentlyDescription1"><![CDATA[Without your recovery password, you cannot load your account on new devices.<br><br>We strongly recommend you save your recovery password in a safe and secure place before continuing.]]></string>
     <string name="recoveryPasswordHidePermanentlyDescription2">Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.</string>
     <string name="recoveryPasswordDescription">Use your recovery password to load your account on new devices.\n\nYour account cannot be recovered without your recovery password. Make sure it\'s stored somewhere safe and secure — and don\'t share it with anyone.</string>
     <string name="hide">Hide</string>