From 2dd87a2b0eabdf5c5a7bdcfdfe7ac4440ece83da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20G=C3=B6ransson?= <david.goransson@mullvad.net>
Date: Tue, 17 Dec 2024 08:47:08 +0100
Subject: [PATCH] Add warning text for battery usage of shadowsocks

---
 .../compose/dialog/info/ObfuscationInfoDialog.kt          | 8 +++++++-
 android/lib/resource/src/main/res/values/strings.xml      | 1 +
 desktop/packages/mullvad-vpn/locales/messages.pot         | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/ObfuscationInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/ObfuscationInfoDialog.kt
index b62862aeaa0e..95f180bdaf14 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/ObfuscationInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/ObfuscationInfoDialog.kt
@@ -10,6 +10,7 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
 import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.constant.NEWLINE_STRING
 
 @Preview
 @Composable
@@ -21,7 +22,12 @@ private fun PreviewObfuscationInfoDialog() {
 @Composable
 fun ObfuscationInfo(navigator: DestinationsNavigator) {
     InfoDialog(
-        message = stringResource(id = R.string.obfuscation_info),
+        message =
+            buildString {
+                appendLine(stringResource(id = R.string.obfuscation_info))
+                append(NEWLINE_STRING)
+                append(stringResource(R.string.obfuscation_info_shadowsocks_batteryusage))
+            },
         onDismiss = dropUnlessResumed { navigator.navigateUp() },
     )
 }
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index 3d3c9a159f0e..4126163dbf50 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -421,4 +421,5 @@
     <string name="multihop_entry_disabled_description">The entry server for %1$s is currently overridden by %2$s. To select an entry server, please first enable “%3$s” or disable \"%4$s\" in the settings.</string>
     <string name="open_feature_settings">Open %1$s settings</string>
     <string name="search">Search</string>
+    <string name="obfuscation_info_shadowsocks_batteryusage">Attention: using Shadowsocks increases battery consumption with heavy data usage.</string>
 </resources>
diff --git a/desktop/packages/mullvad-vpn/locales/messages.pot b/desktop/packages/mullvad-vpn/locales/messages.pot
index bb4882f5138a..529d43a97be1 100644
--- a/desktop/packages/mullvad-vpn/locales/messages.pot
+++ b/desktop/packages/mullvad-vpn/locales/messages.pot
@@ -2327,6 +2327,9 @@ msgstr ""
 msgid "Attention: this setting cannot be used in combination with \"Use custom DNS server\"."
 msgstr ""
 
+msgid "Attention: using Shadowsocks increases battery consumption with heavy data usage."
+msgstr ""
+
 msgid "Auto-connect & Lockdown mode"
 msgstr ""