From b0b87fc0dbc56e3b953567c57d6b6db48ef82a5f Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 17 Jan 2020 13:12:16 +0000
Subject: [PATCH] Clean up logic for enabling/disabling settings.

---
 .../briar/android/settings/SettingsFragment.java           | 7 +++----
 1 file changed, 3 insertions(+), 4 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 0cc96c6f8..8ddba892f 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
@@ -573,10 +573,9 @@ public class SettingsFragment extends PreferenceFragmentCompat
 			storeWifiSetting(wifiSetting);
 		} else if (preference == enableTor) {
 			boolean torEnabledSetting = (Boolean) newValue;
-			torNetwork.setEnabled(torNetwork.isEnabled() && torEnabledSetting);
-			torMobile.setEnabled(torMobile.isEnabled() && torEnabledSetting);
-			torOnlyWhenCharging.setEnabled(torOnlyWhenCharging.isEnabled() &&
-					torEnabledSetting);
+			torNetwork.setEnabled(torEnabledSetting);
+			torMobile.setEnabled(torEnabledSetting);
+			torOnlyWhenCharging.setEnabled(torEnabledSetting);
 			storeTorEnabledSetting(torEnabledSetting);
 		} else if (preference == torNetwork) {
 			int torNetworkSetting = Integer.valueOf((String) newValue);