From 2c6f81a1206b3005ca3cf5877883716604a689cd Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 29 Jan 2020 14:57:58 +0000
Subject: [PATCH] Don't show Tor in the enabling state if it's disabled by
 settings.

---
 .../briarproject/bramble/plugin/tor/TorPlugin.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 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 db69469f1..86fcc6a8c 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
@@ -191,7 +191,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public void start() throws PluginException {
 		if (used.getAndSet(true)) throw new IllegalStateException();
-		state.setStarted();
 		if (!torDirectory.exists()) {
 			if (!torDirectory.mkdirs()) {
 				LOG.warning("Could not create Tor directory.");
@@ -279,7 +278,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		} catch (IOException e) {
 			throw new PluginException(e);
 		}
-		state.setTorStarted();
+		state.setStarted();
 		// Check whether we're online
 		updateConnectionStatus(networkManager.getNetworkStatus(),
 				batteryManager.isCharging());
@@ -863,7 +862,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		@GuardedBy("this")
 		private boolean started = false,
 				stopped = false,
-				torStarted = false,
 				networkInitialised = false,
 				networkEnabled = false,
 				bootstrapped = false,
@@ -882,13 +880,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			callback.pluginStateChanged(getState());
 		}
 
-		// Doesn't affect getState()
-		synchronized void setTorStarted() {
-			torStarted = true;
-		}
-
 		synchronized boolean isTorRunning() {
-			return torStarted && !stopped;
+			return started && !stopped;
 		}
 
 		@Nullable