summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/firewall
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2020-03-02 04:17:23 +0100
committercyBerta <cyberta@riseup.net>2020-03-02 04:17:23 +0100
commit2fcae35a5592aae3ac932e595717ea8d185ab606 (patch)
treebfb2485f9caa4c9af888d9b7eee1d7c6356c6f1f /app/src/main/java/se/leap/bitmaskclient/firewall
parentf1c88d01dbbcc2ccd1fd7f82c822e5f280ed75f7 (diff)
finish bluetooth tethering implementation
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/firewall')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/firewall/SetupTetheringTask.java17
1 files changed, 10 insertions, 7 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/firewall/SetupTetheringTask.java b/app/src/main/java/se/leap/bitmaskclient/firewall/SetupTetheringTask.java
index 7abd01a8..6ce8ee61 100644
--- a/app/src/main/java/se/leap/bitmaskclient/firewall/SetupTetheringTask.java
+++ b/app/src/main/java/se/leap/bitmaskclient/firewall/SetupTetheringTask.java
@@ -130,7 +130,7 @@ public class SetupTetheringTask extends AsyncTask<Void, Boolean, Boolean> {
}
private boolean removeWifiTetheringRules(TetheringState state, StringBuilder log) throws Exception {
- Log.d(TAG, "add Wifi tethering Rules");
+ Log.d(TAG, "remove Wifi tethering Rules");
String[] removeRules = getDeletionRules(state, state.lastSeenWifiAddress, state.lastSeenWifiInterface);
return runBlockingCmd(removeRules, log) == 0;
}
@@ -142,18 +142,21 @@ public class SetupTetheringTask extends AsyncTask<Void, Boolean, Boolean> {
}
private boolean removeUsbTetheringRules(TetheringState state, StringBuilder log) throws Exception {
- Log.d(TAG, "add usb tethering rules");
+ Log.d(TAG, "remove usb tethering rules");
String[] addRules = getDeletionRules(state, state.lastSeenUsbAddress, state.lastSeenUsbInterface);
return runBlockingCmd(addRules, log) == 0;
}
- //TODO: implement the follwing methods -v
- private boolean removeBluetoothTetheringRules(TetheringState state, StringBuilder log) {
- return true;
+ private boolean removeBluetoothTetheringRules(TetheringState state, StringBuilder log) throws Exception {
+ Log.d(TAG, "add bluetooth tethering rules");
+ String[] addRules = getAdditionRules(state.bluetoothAddress, state.bluetoothInterface);
+ return runBlockingCmd(addRules, log) == 0;
}
- private boolean addBluetoothTetheringRules(TetheringState state, StringBuilder log) {
- return true;
+ private boolean addBluetoothTetheringRules(TetheringState state, StringBuilder log) throws Exception {
+ Log.d(TAG, "remove bluetooth tethering rules");
+ String[] addRules = getDeletionRules(state, state.lastSeenBluetoothAddress, state.lastSeenBluetoothInterface);
+ return runBlockingCmd(addRules, log) == 0;
}
private String[] getAdditionRules(String addressRange, String interfaceName) {