diff options
author | cyBerta <cyberta@riseup.net> | 2021-11-11 22:16:15 +0100 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2021-11-11 22:21:05 +0100 |
commit | a917cbe977f640345677b97dc9b00900d78c46b3 (patch) | |
tree | 0e2745401674ae0d83b52883474097e9ff851994 /app/src/main/java/se/leap/bitmaskclient/eip/EipSetupObserver.java | |
parent | 0b687502d047253ca50b691c29336bc3e53a29d2 (diff) |
use command pattern to start/stop tor service, similar to EIP and ProviderAPI service
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/eip/EipSetupObserver.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/eip/EipSetupObserver.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EipSetupObserver.java b/app/src/main/java/se/leap/bitmaskclient/eip/EipSetupObserver.java index 203885a1..023a1ce1 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/EipSetupObserver.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipSetupObserver.java @@ -44,6 +44,8 @@ import se.leap.bitmaskclient.base.models.ProviderObservable; import se.leap.bitmaskclient.base.utils.PreferenceHelper; import se.leap.bitmaskclient.providersetup.ProviderAPI; import se.leap.bitmaskclient.providersetup.ProviderAPICommand; +import se.leap.bitmaskclient.tor.TorServiceCommand; +import se.leap.bitmaskclient.tor.TorServiceConnection; import se.leap.bitmaskclient.tor.TorStatusObservable; import static android.app.Activity.RESULT_CANCELED; @@ -213,8 +215,7 @@ public class EipSetupObserver extends BroadcastReceiver implements VpnStatus.Sta case INCORRECTLY_DOWNLOADED_EIP_SERVICE: case INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE: if (TorStatusObservable.getStatus() != OFF) { - Intent stopIntent = new Intent(context, TorService.class); - context.stopService(stopIntent); + TorServiceCommand.stopTorServiceAsync(context); } Log.d(TAG, "PROVIDER NOK - FETCH FAILED"); break; @@ -368,7 +369,7 @@ public class EipSetupObserver extends BroadcastReceiver implements VpnStatus.Sta observedProfileFromVpnStatus = null; this.changingGateway.set(changingGateway); if (TorStatusObservable.getStatus() != OFF) { - TorStatusObservable.shutdownTor(context); + TorServiceCommand.stopTorServiceAsync(context); } } |