Skip to content

Commit

Permalink
Add warning text for battery usage of shadowsocks
Browse files Browse the repository at this point in the history
  • Loading branch information
Rawa committed Dec 17, 2024
1 parent a59360c commit be884e5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() },
)
}
1 change: 1 addition & 0 deletions android/lib/resource/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 3 additions & 0 deletions desktop/packages/mullvad-vpn/locales/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""

Expand Down

0 comments on commit be884e5

Please sign in to comment.