summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
Diffstat (limited to 'android')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt5
1 files changed, 4 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt
index b11ef59630..48599da15a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt
@@ -63,8 +63,11 @@ fun InfoDialog(message: String, additionalInfo: String? = null, onDismiss: () ->
Spacer(modifier = Modifier.height(Dimens.verticalSpace))
val htmlFormattedString =
HtmlCompat.fromHtml(additionalInfo, HtmlCompat.FROM_HTML_MODE_COMPACT)
+ val annotated = htmlFormattedString.toAnnotatedString()
+ // fromHtml may add a trailing newline when using HTML tags, so we remove it
+ val trimmed = annotated.substring(0, annotated.trimEnd().length)
Text(
- text = htmlFormattedString.toAnnotatedString(),
+ text = trimmed,
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.bodySmall,
modifier = Modifier.fillMaxWidth()