Merge branch 'implement-increased-power-consumption-warning-droid-1581'

3 files changed, 11 insertions, 1 deletions

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 b62862aeaa..95f180bdaf 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 a0098ae847..bc3512501c 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -415,4 +415,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: Shadowsocks can increase battery consumption depending on data usage, such as streaming a video.</string>
 </resources>
diff --git a/desktop/packages/mullvad-vpn/locales/messages.pot b/desktop/packages/mullvad-vpn/locales/messages.pot
index 46f455cd1d..be9d787aa5 100644
--- a/desktop/packages/mullvad-vpn/locales/messages.pot
+++ b/desktop/packages/mullvad-vpn/locales/messages.pot
@@ -2349,6 +2349,9 @@ msgstr ""
 msgid "Attention: If \"Block connections without VPN\" is enabled, split apps will not have Internet. Always keep in mind that split tunneling is a privacy risk."
 msgstr ""
 
+msgid "Attention: Shadowsocks can increase battery consumption depending on data usage, such as streaming a video."
+msgstr ""
+
 msgid "Attention: this setting cannot be used in combination with \"Use custom DNS server\"."
 msgstr ""