From 649635bc8f8178aba36f07b59ada813f55dc34a0 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 7 Mar 2020 01:04:19 +0100
Subject: fix bluetooth tethering

---
 .../bitmaskclient/tethering/TetheringStateManager.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/tethering/TetheringStateManager.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringStateManager.java b/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringStateManager.java
index 1a11945b..0af4c357 100644
--- a/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringStateManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringStateManager.java
@@ -85,7 +85,7 @@ public class TetheringStateManager {
     }
 
     static void updateBluetoothTetheringState() {
-        TetheringObservable.setBluetoothTethering(isBluetoothTetheringEnabled());
+        TetheringObservable.setBluetoothTethering(isBluetoothTetheringEnabled(), getBluetoothAddressRange(), getBluetoothInterfaceName());
     }
 
     private static String getWifiAddressRange() {
@@ -98,6 +98,11 @@ public class TetheringStateManager {
         return getAddressRange(interfaceAddress);
     }
 
+    private static String getBluetoothAddressRange() {
+        String interfaceAddress = getInterfaceAddress(getBluetoothInterface());
+        return getAddressRange(interfaceAddress);
+    }
+
     private static String getWlanInterfaceName() {
         return getInterfaceName(getWlanInterface());
     }
@@ -106,6 +111,10 @@ public class TetheringStateManager {
         return getInterfaceName(getUsbInterface());
     }
 
+    private static String getBluetoothInterfaceName() {
+        return getInterfaceName(getBluetoothInterface());
+    }
+
     private static NetworkInterface getWlanInterface() {
         return getNetworkInterface(new String[]{"wlan", "eth"});
     }
@@ -114,6 +123,10 @@ public class TetheringStateManager {
         return getNetworkInterface(new String[]{"rndis"});
     }
 
+    private static NetworkInterface getBluetoothInterface() {
+        return getNetworkInterface(new String[]{"bt-pan"});
+    }
+
     private static boolean isBluetoothTetheringEnabled() {
         StringBuilder log = new StringBuilder();
         boolean hasBtPan = false;
-- 
cgit v1.2.3