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

Show names of countries where Tor is blocked.

Browse Source
This commit is contained in:
akwizgran
2018-08-09 13:55:06 +01:00
parent 52efbcac8a
commit 0e6c374d0e
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View File

@@ -300,8 +300,26 @@ public class SettingsFragment extends PreferenceFragmentCompat
} }
private void setBlockedCountries() { private void setBlockedCountries() {
List<String> countries = new ArrayList<>(asList(BLOCKED)); List<String> countryCodes = new ArrayList<>(asList(BLOCKED));
countries.removeAll(asList(BRIDGES)); countryCodes.removeAll(asList(BRIDGES));
// Look up country names in the user's chosen language if available
Locale[] locales = Locale.getAvailableLocales();
List<String> countries = new ArrayList<>(countryCodes.size());
for (String countryCode : countryCodes) {
boolean found = false;
for (Locale locale : locales) {
if (locale.getCountry().equalsIgnoreCase(countryCode)) {
countries.add(locale.getDisplayCountry());
found = true;
break;
}
}
if (!found) {
if (LOG.isLoggable(INFO))
LOG.info("No locale for " + countryCode);
countries.add(countryCode);
}
}
Collections.sort(countries); Collections.sort(countries);
String format = getString(R.string.tor_location_setting_hint_format); String format = getString(R.string.tor_location_setting_hint_format);
torBlocked.setSummary(String.format(format, join(countries, ", "))); torBlocked.setSummary(String.format(format, join(countries, ", ")));