Merge branch 'crash-when-getting-firewall-policy-error-droid-505'

2 files changed, 21 insertions, 3 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt
index 6078e4b392..2bcda3ea35 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt
@@ -37,6 +37,7 @@ import net.mullvad.mullvadvpn.ui.VersionInfo
 import net.mullvad.mullvadvpn.ui.notification.StatusLevel
 import net.mullvad.talpid.tunnel.ErrorState
 import net.mullvad.talpid.tunnel.ErrorStateCause
+import net.mullvad.talpid.tunnel.FirewallPolicyError
 import org.joda.time.DateTime
 
 @Preview
@@ -61,7 +62,13 @@ private fun PreviewNotificationBanner() {
                         InAppNotification.TunnelStateBlocked,
                         InAppNotification.NewDevice("Courageous Turtle"),
                         InAppNotification.TunnelStateError(
-                            error = ErrorState(ErrorStateCause.SetFirewallPolicyError, true)
+                            error =
+                                ErrorState(
+                                    ErrorStateCause.SetFirewallPolicyError(
+                                        FirewallPolicyError.Generic
+                                    ),
+                                    true
+                                )
                         )
                     )
                     .map { it.toNotificationData({}, {}, {}) }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationData.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationData.kt
index 3fbf0ad095..16efa6c88b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationData.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationData.kt
@@ -113,8 +113,19 @@ private fun errorMessageBannerData(error: ErrorState) =
     error.getErrorNotificationResources(LocalContext.current).run {
         NotificationData(
             title = stringResource(id = titleResourceId),
-            message = optionalMessageArgument?.let { stringResource(id = messageResourceId, it) }
-                    ?: stringResource(id = messageResourceId),
+            message =
+                HtmlCompat.fromHtml(
+                        optionalMessageArgument?.let { stringResource(id = messageResourceId, it) }
+                            ?: stringResource(id = messageResourceId),
+                        HtmlCompat.FROM_HTML_MODE_COMPACT
+                    )
+                    .toAnnotatedString(
+                        boldSpanStyle =
+                            SpanStyle(
+                                color = MaterialTheme.colorScheme.onBackground,
+                                fontWeight = FontWeight.ExtraBold
+                            )
+                    ),
             statusLevel = StatusLevel.Error,
             action = null
         )