From 4b9a9771f8aa7df69d3cafa228e0d10e1f6dce44 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 16 Aug 2018 12:27:26 -0300
Subject: [PATCH] Tor settings: Address review comments

---
 .../java/org/briarproject/bramble/plugin/tor/TorPlugin.java   | 2 +-
 .../briarproject/briar/android/settings/SettingsFragment.java | 2 +-
 briar-android/src/main/res/values/strings.xml                 | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
index 0cbacd3fe..aaf7d22a4 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
@@ -649,7 +649,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 					enableNetwork(false);
 				} else if (network == PREF_TOR_NETWORK_NEVER ||
 						(!useMobile && !wifi)) {
-					LOG.info("Disabling network due to data setting");
+					LOG.info("Disabling network due to setting");
 					enableNetwork(false);
 				} else if (automatic && blocked && !bridgesWork) {
 					LOG.info("Disabling network, country is blocked");
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
index 0904e1b97..3571f49fe 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
@@ -314,7 +314,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
 
 		// Look up country name in the user's chosen language if available
 		String country = locationUtils.getCurrentCountry();
-		String countryName = getString(R.string.tor_network_country_unknown);
+		String countryName = country;
 		for (Locale locale : Locale.getAvailableLocales()) {
 			if (locale.getCountry().equalsIgnoreCase(country)) {
 				countryName = locale.getDisplayCountry();
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 746094f0b..467d6004a 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -355,9 +355,7 @@
 	<string name="tor_network_setting_never">Don\'t connect</string>
 	<!-- How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus) -->
 	<string name="tor_network_setting_summary">Automatic: %1$s (in %2$s)</string>
-	<!-- The placeholder when we don't know the user's current country -->
-	<string name="tor_network_country_unknown">unknown</string>
-	<string name="tor_mobile_data_title">Use Mobile Data</string>
+	<string name="tor_mobile_data_title">Use mobile data</string>
 
 	<!-- Settings Security and Panic -->
 	<string name="security_settings_title">Security</string>