Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Update summary of Tor bridges setting.

Browse Source
This commit is contained in:
akwizgran
2024-03-09 21:21:18 +00:00
parent ca9181ee3f
commit 48b6dcf0ff
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/main/java/org/briarproject/briar/android/settings/TorSummaryProvider.java
View File

@@ -40,15 +40,12 @@ class TorSummaryProvider implements SummaryProvider<ListPreference> {
String country = locationUtils.getCurrentCountry(); String country = locationUtils.getCurrentCountry();
String countryName = getCountryDisplayName(country); String countryName = getCountryDisplayName(country);
boolean blocked = boolean useBridgesByDefault =
circumventionProvider.isTorProbablyBlocked(country); circumventionProvider.shouldUseBridges(country);
boolean useBridges = circumventionProvider.doBridgesWork(country);
String setting = String setting =
ctx.getString(R.string.tor_network_setting_without_bridges); ctx.getString(R.string.tor_network_setting_without_bridges);
if (blocked && useBridges) { if (useBridgesByDefault) {
setting = ctx.getString(R.string.tor_network_setting_with_bridges); setting = ctx.getString(R.string.tor_network_setting_with_bridges);
} else if (blocked) {
setting = ctx.getString(R.string.tor_network_setting_never);
} }
return ctx.getString(R.string.tor_network_setting_summary, setting, return ctx.getString(R.string.tor_network_setting_summary, setting,
countryName); countryName);