From 7ae86d70af96e6a302664cc527a5533e3e6aba96 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 16 Jan 2020 14:51:32 +0000
Subject: [PATCH] Convert Bluetooth setting to a switch.

---
 .../briar/android/settings/SettingsFragment.java       | 10 ++++++----
 briar-android/src/main/res/values/arrays.xml           | 10 +---------
 briar-android/src/main/res/values/strings.xml          |  4 +---
 briar-android/src/main/res/xml/settings.xml            |  6 ++----
 4 files changed, 10 insertions(+), 20 deletions(-)

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 00c3ef84f..2d469d5ce 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
@@ -114,6 +114,8 @@ public class SettingsFragment extends PreferenceFragmentCompat
 
 	private static final String BT_NAMESPACE =
 			BluetoothConstants.ID.getString();
+	private static final String BT_ENABLE = "pref_key_bluetooth";
+
 	private static final String TOR_NAMESPACE = TorConstants.ID.getString();
 	private static final String TOR_ENABLE = "pref_key_tor_enable";
 	private static final String TOR_NETWORK = "pref_key_tor_network";
@@ -126,7 +128,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
 
 	private SettingsActivity listener;
 	private ListPreference language;
-	private ListPreference enableBluetooth;
+	private SwitchPreference enableBluetooth;
 	private SwitchPreference enableTor;
 	private ListPreference torNetwork;
 	private SwitchPreference torMobile;
@@ -171,7 +173,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
 		language = findPreference(LANGUAGE);
 		setLanguageEntries();
 		ListPreference theme = findPreference("pref_key_theme");
-		enableBluetooth = findPreference("pref_key_bluetooth");
+		enableBluetooth = findPreference(BT_ENABLE);
 		enableTor = findPreference(TOR_ENABLE);
 		torNetwork = findPreference(TOR_NETWORK);
 		torMobile = findPreference(TOR_MOBILE);
@@ -369,7 +371,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
 
 			boolean btEnabledSetting =
 					btSettings.getBoolean(PREF_BT_ENABLE, false);
-			enableBluetooth.setValue(Boolean.toString(btEnabledSetting));
+			enableBluetooth.setChecked(btEnabledSetting);
 
 			boolean torEnabledSetting =
 					torSettings.getBoolean(PREF_TOR_ENABLE, true);
@@ -550,7 +552,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
 				languageChanged((String) newValue);
 			return false;
 		} else if (preference == enableBluetooth) {
-			boolean btSetting = Boolean.valueOf((String) newValue);
+			boolean btSetting = (Boolean) newValue;
 			storeBluetoothSettings(btSetting);
 		} else if (preference == enableTor) {
 			boolean torEnabledSetting = (Boolean) newValue;
diff --git a/briar-android/src/main/res/values/arrays.xml b/briar-android/src/main/res/values/arrays.xml
index 3ed985eec..8a7313b73 100644
--- a/briar-android/src/main/res/values/arrays.xml
+++ b/briar-android/src/main/res/values/arrays.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string-array name="boolean_array">
-		<item>true</item>
-		<item>false</item>
-	</string-array>
-	<string-array name="bt_setting_names">
-		<item>@string/bluetooth_setting_enabled</item>
-		<item>@string/bluetooth_setting_disabled</item>
-	</string-array>
-
 	<string-array name="tor_network_setting_names">
 		<item>@string/tor_network_setting_automatic</item>
 		<item>@string/tor_network_setting_without_bridges</item>
@@ -64,6 +55,7 @@
 		<item>zh-CN</item>
 		<item>zh-TW</item>
 	</string-array>
+
 	<string-array name="pref_theme_entries">
 		<item>@string/pref_theme_light</item>
 		<item>@string/pref_theme_dark</item>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index fe20d9e95..dea0d1b98 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -445,9 +445,7 @@
 
 	<!-- Settings Connections -->
 	<string name="network_settings_title">Connections</string>
-	<string name="bluetooth_setting">Connect via Bluetooth</string>
-	<string name="bluetooth_setting_enabled">Whenever contacts are nearby</string>
-	<string name="bluetooth_setting_disabled">Only when adding contacts</string>
+	<string name="bluetooth_setting">Connect to contacts via Bluetooth</string>
 	<string name="tor_enable_title">Connect to contacts via Internet (Tor)</string>
 	<string name="tor_network_setting">Connection method for Internet (Tor)</string>
 	<string name="tor_network_setting_automatic">Automatic based on location</string>
diff --git a/briar-android/src/main/res/xml/settings.xml b/briar-android/src/main/res/xml/settings.xml
index b6c0b86ce..f06bd78d7 100644
--- a/briar-android/src/main/res/xml/settings.xml
+++ b/briar-android/src/main/res/xml/settings.xml
@@ -29,14 +29,12 @@
 		android:layout="@layout/preferences_category"
 		android:title="@string/network_settings_title">
 
-		<ListPreference
+		<SwitchPreference
 			android:defaultValue="false"
-			android:entries="@array/bt_setting_names"
-			android:entryValues="@array/boolean_array"
 			android:key="pref_key_bluetooth"
 			android:persistent="false"
-			android:summary="%s"
 			android:title="@string/bluetooth_setting"
+			android:widgetLayout="@layout/preference_switch_compat"
 			app:iconSpaceReserved="false"/>
 
 		<SwitchPreference