summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/blinkt
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2020-01-24 14:21:34 -0600
committercyberta <cyberta@riseup.net>2020-01-24 14:21:34 -0600
commit0fe9d37a223b388103e2924e6d1a28bcb0ae38fd (patch)
tree655c25f7cc02ac0fa374ecc8a00cab840553e3ee /app/src/main/java/de/blinkt
parent2ff2358861bcd0c05586f972724ef76e5a67060c (diff)
rearrange firewalling code, move to separate package
Diffstat (limited to 'app/src/main/java/de/blinkt')
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index 766dc925..7c17bed9 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -47,7 +47,7 @@ import de.blinkt.openvpn.core.connection.Obfs4Connection;
import se.leap.bitmaskclient.R;
import se.leap.bitmaskclient.VpnNotificationManager;
import se.leap.bitmaskclient.pluggableTransports.Shapeshifter;
-import se.leap.bitmaskclient.utils.FirewallHelper;
+import se.leap.bitmaskclient.firewall.FirewallManager;
import static de.blinkt.openvpn.core.ConnectionStatus.LEVEL_CONNECTED;
import static de.blinkt.openvpn.core.ConnectionStatus.LEVEL_WAITING_FOR_USER_INPUT;
@@ -90,7 +90,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
private Runnable mOpenVPNThread;
private VpnNotificationManager notificationManager;
private Shapeshifter shapeshifter;
- private FirewallHelper firewallHelper;
+ private FirewallManager firewallManager;
private static final int PRIORITY_MIN = -2;
private static final int PRIORITY_DEFAULT = 0;
@@ -194,7 +194,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
VpnStatus.removeStateListener(this);
}
}
- firewallHelper.shutdownFirewall();
+ firewallManager.shutdownFirewall();
}
private boolean runningOnAndroidTV() {
@@ -449,7 +449,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
mProcessThread.start();
}
- firewallHelper.startFirewall();
+ firewallManager.startFirewall();
new Handler(getMainLooper()).post(() -> {
if (mDeviceStateReceiver != null) {
@@ -518,7 +518,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
super.onCreate();
notificationManager = new VpnNotificationManager(this, this);
notificationManager.createOpenVpnNotificationChannel();
- firewallHelper = new FirewallHelper(this);
+ firewallManager = new FirewallManager(this);
}
@Override