From 2a8d82d85f4cfd34143d87174ee022966e364f69 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 3 Mar 2020 02:02:16 +0100
Subject: take vpn state into account in isVpnTetheringRunning()

---
 app/src/main/java/se/leap/bitmaskclient/tethering/TetheringState.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringState.java b/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringState.java
index 103462cc..7ee7bec7 100644
--- a/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringState.java
+++ b/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringState.java
@@ -1,5 +1,7 @@
 package se.leap.bitmaskclient.tethering;
 
+import de.blinkt.openvpn.core.VpnStatus;
+
 public class TetheringState implements Cloneable {
     public boolean isWifiTetheringEnabled;
     public boolean isUsbTetheringEnabled;
@@ -42,7 +44,7 @@ public class TetheringState implements Cloneable {
     }
 
     public boolean isVpnTetheringRunning() {
-        return tetherWifiVpn() || tetherUsbVpn() || tetherBluetoothVpn();
+        return (tetherWifiVpn() || tetherUsbVpn() || tetherBluetoothVpn()) && VpnStatus.isVPNActive();
     }
 
 
-- 
cgit v1.2.3