From 1ae9750c13a08ee8a9713df55245d36a05cb0f00 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 20 Jan 2020 16:41:39 +0000
Subject: [PATCH] Use XML to specify dependencies between settings.

---
 .../briar/android/settings/SettingsFragment.java         | 9 +++------
 briar-android/src/main/res/xml/settings.xml              | 3 +++
 2 files changed, 6 insertions(+), 6 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 8ddba892f..4e2ab8f83 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
@@ -464,9 +464,9 @@ public class SettingsFragment extends PreferenceFragmentCompat
 		enableBluetooth.setEnabled(enabled);
 		enableWifi.setEnabled(enabled);
 		enableTor.setEnabled(enabled);
-		torNetwork.setEnabled(enabled && enableTor.isChecked());
-		torMobile.setEnabled(enabled && enableTor.isChecked());
-		torOnlyWhenCharging.setEnabled(enabled && enableTor.isChecked());
+		torNetwork.setEnabled(enabled);
+		torMobile.setEnabled(enabled);
+		torOnlyWhenCharging.setEnabled(enabled);
 		if (!enabled) screenLock.setEnabled(false);
 		notifyPrivateMessages.setEnabled(enabled);
 		notifyGroupMessages.setEnabled(enabled);
@@ -573,9 +573,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 			storeWifiSetting(wifiSetting);
 		} else if (preference == enableTor) {
 			boolean torEnabledSetting = (Boolean) newValue;
-			torNetwork.setEnabled(torEnabledSetting);
-			torMobile.setEnabled(torEnabledSetting);
-			torOnlyWhenCharging.setEnabled(torEnabledSetting);
 			storeTorEnabledSetting(torEnabledSetting);
 		} else if (preference == torNetwork) {
 			int torNetworkSetting = Integer.valueOf((String) newValue);
diff --git a/briar-android/src/main/res/xml/settings.xml b/briar-android/src/main/res/xml/settings.xml
index b1b40552f..db50e4732 100644
--- a/briar-android/src/main/res/xml/settings.xml
+++ b/briar-android/src/main/res/xml/settings.xml
@@ -55,6 +55,7 @@
 
 		<ListPreference
 			android:defaultValue="0"
+			android:dependency="pref_key_tor_enable"
 			android:entries="@array/tor_network_setting_names"
 			android:entryValues="@array/tor_network_setting_values"
 			android:key="pref_key_tor_network"
@@ -65,6 +66,7 @@
 
 		<SwitchPreference
 			android:defaultValue="true"
+			android:dependency="pref_key_tor_enable"
 			android:key="pref_key_tor_mobile_data"
 			android:persistent="false"
 			android:title="@string/tor_mobile_data_title"
@@ -73,6 +75,7 @@
 
 		<SwitchPreference
 			android:defaultValue="false"
+			android:dependency="pref_key_tor_enable"
 			android:key="pref_key_tor_only_when_charging"
 			android:persistent="false"
 			android:title="@string/tor_only_when_charging_title"