From a917cbe977f640345677b97dc9b00900d78c46b3 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 11 Nov 2021 22:16:15 +0100
Subject: use command pattern to start/stop tor service, similar to EIP and
 ProviderAPI service

---
 .../leap/bitmaskclient/providersetup/ProviderApiManagerBase.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
index 8d626245..e2f98ca4 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
@@ -152,7 +152,7 @@ public abstract class ProviderApiManagerBase {
 
     public interface ProviderApiServiceCallback {
         void broadcastEvent(Intent intent);
-        void startTorService() throws InterruptedException, IllegalStateException;
+        boolean startTorService() throws InterruptedException, IllegalStateException, TimeoutException;
         void stopTorService();
         int getTorHttpTunnelPort();
         boolean hasNetworkConnection();
@@ -314,9 +314,8 @@ public abstract class ProviderApiManagerBase {
 
     protected boolean startTorProxy() throws InterruptedException, IllegalStateException, TimeoutException {
         if (EipStatus.getInstance().isDisconnected() &&
-                PreferenceHelper.getUseTor(preferences)
-        ) {
-            serviceCallback.startTorService();
+                PreferenceHelper.getUseTor(preferences) &&
+            serviceCallback.startTorService()) {
             waitForTorCircuits();
             if (TorStatusObservable.isCancelled()) {
                 throw new InterruptedException("Cancelled Tor setup.");
-- 
cgit v1.2.3