use command pattern to start/stop tor service, similar to EIP and ProviderAPI service

1 files changed, 5 insertions, 6 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/tor/TorStatusObservable.java b/app/src/main/java/se/leap/bitmaskclient/tor/TorStatusObservable.java
index ade22e6b..d426d51e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/tor/TorStatusObservable.java
+++ b/app/src/main/java/se/leap/bitmaskclient/tor/TorStatusObservable.java
@@ -261,12 +261,11 @@ public class TorStatusObservable extends Observable {
         return "";
     }
 
-    public static void shutdownTor(Context context) {
-        getInstance().cancelled = true;
-        getInstance().notifyObservers();
-
-        Intent intent = new Intent(context, TorService.class);
-        context.stopService(intent);
+    public static void markCancelled() {
+        if (!getInstance().cancelled) {
+            getInstance().cancelled = true;
+            getInstance().notifyObservers();
+        }
     }
 
     public static boolean isCancelled() {