Merge branch 'ios-1017-daita-warning'

2 files changed, 22 insertions, 14 deletions

diff --git a/ios/MullvadVPN/Coordinators/Settings/DAITA/SettingsDAITAView.swift b/ios/MullvadVPN/Coordinators/Settings/DAITA/SettingsDAITAView.swift
index fada270763..492eab5619 100644
--- a/ios/MullvadVPN/Coordinators/Settings/DAITA/SettingsDAITAView.swift
+++ b/ios/MullvadVPN/Coordinators/Settings/DAITA/SettingsDAITAView.swift
@@ -104,15 +104,14 @@ extension SettingsDAITAView {
                         "SETTINGS_INFO_DAITA_PAGE_1",
                         tableName: "Settings",
                         value: """
+                        **Attention: This increases network traffic and will also negatively affect speed, latency, \
+                        and battery usage. Use with caution on limited plans.**
+
                         DAITA (Defense against AI-guided Traffic Analysis) hides patterns in \
                         your encrypted VPN traffic.
 
                         By using sophisticated AI it’s possible to analyze the traffic of data \
                         packets going in and out of your device (even if the traffic is encrypted).
-
-                        If an observer monitors these data packets, DAITA makes it significantly \
-                        harder for them to identify which websites you are visiting or with whom \
-                        you are communicating.
                         """,
                         comment: ""
                     ),
@@ -123,14 +122,16 @@ extension SettingsDAITAView {
                         "SETTINGS_INFO_DAITA_PAGE_2",
                         tableName: "Settings",
                         value: """
+                        If an observer monitors these data packets, DAITA makes it significantly \
+                        harder for them to identify which websites you are visiting or with whom \
+                        you are communicating.
+
                         DAITA does this by carefully adding network noise and making all network \
                         packets the same size.
 
                         Not all our servers are DAITA-enabled. Therefore, we use multihop \
                         automatically to enable DAITA with any server.
 
-                        Attention: Be cautious if you have a limited data plan as this feature \
-                        will increase your network traffic.
                         """,
                         comment: ""
                     ),
diff --git a/ios/MullvadVPN/Coordinators/Settings/Views/SettingsInfoView.swift b/ios/MullvadVPN/Coordinators/Settings/Views/SettingsInfoView.swift
index 0b0b0f92ef..c0c1fc15fb 100644
--- a/ios/MullvadVPN/Coordinators/Settings/Views/SettingsInfoView.swift
+++ b/ios/MullvadVPN/Coordinators/Settings/Views/SettingsInfoView.swift
@@ -50,6 +50,13 @@ struct SettingsInfoView: View {
         .hidden()
     }
 
+    private func bodyText(_ page: SettingsInfoViewModelPage) -> some View {
+        (try? AttributedString(
+            markdown: page.body,
+            options: AttributedString.MarkdownParsingOptions(interpretedSyntax: .inlineOnlyPreservingWhitespace)
+        )).map(Text.init) ?? Text(page.body)
+    }
+
     private func contentView() -> some View {
         ForEach(viewModel.pages, id: \.self) { page in
             VStack {
@@ -57,7 +64,7 @@ struct SettingsInfoView: View {
                     Image(page.image)
                         .resizable()
                         .aspectRatio(contentMode: .fit)
-                    Text(page.body)
+                    bodyText(page)
                         .font(.subheadline)
                         .opacity(0.6)
                 }
@@ -130,15 +137,14 @@ struct SettingsInfoView: View {
                         "SETTINGS_INFO_DAITA_PAGE_1",
                         tableName: "Settings",
                         value: """
+                        **Attention: This increases network traffic and will also  negatively affect speed, latency, \
+                        and battery usage. Use with caution on limited plans.**
+
                         DAITA (Defense against AI-guided Traffic Analysis) hides patterns in \
                         your encrypted VPN traffic.
 
                         By using sophisticated AI it’s possible to analyze the traffic of data \
                         packets going in and out of your device (even if the traffic is encrypted).
-
-                        If an observer monitors these data packets, DAITA makes it significantly \
-                        harder for them to identify which websites you are visiting or with whom \
-                        you are communicating.
                         """,
                         comment: ""
                     ),
@@ -149,14 +155,15 @@ struct SettingsInfoView: View {
                         "SETTINGS_INFO_DAITA_PAGE_2",
                         tableName: "Settings",
                         value: """
+                        If an observer monitors these data packets, DAITA makes it significantly \
+                        harder for them to identify which websites you are visiting or with whom \
+                        you are communicating.
+
                         DAITA does this by carefully adding network noise and making all network \
                         packets the same size.
 
                         Not all our servers are DAITA-enabled. Therefore, we use multihop \
                         automatically to enable DAITA with any server.
-
-                        Attention: Be cautious if you have a limited data plan as this feature \
-                        will increase your network traffic.
                         """,
                         comment: ""
                     ),