implement bluetooth tethering detection, refactor TetheringObservable

1 files changed, 10 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringBroadcastReceiver.java b/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringBroadcastReceiver.java
index c5840171..54c312d7 100644
--- a/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringBroadcastReceiver.java
+++ b/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringBroadcastReceiver.java
@@ -4,19 +4,26 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.wifi.WifiManager;
+import android.util.Log;
 
 public class TetheringBroadcastReceiver extends BroadcastReceiver {
+    private static final String TAG = TetheringBroadcastReceiver.class.getSimpleName();
+
     @Override
     public void onReceive(Context context, Intent intent) {
         if ("android.net.wifi.WIFI_AP_STATE_CHANGED".equals(intent.getAction())) {
+            Log.d(TAG, "TETHERING WIFI_AP_STATE_CHANGED");
             int apState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE, 0);
             if (WifiHotspotState.WIFI_AP_STATE_ENABLED.ordinal() == apState % 10) {
-                TetheringObserver.getInstance().setWifiTetheringEnabled(true);
+                TetheringObservable.setWifiTethering(true);
             } else {
-                TetheringObserver.getInstance().setWifiTetheringEnabled(false);
+                TetheringObservable.setWifiTethering(false);
             }
         } else if ("android.net.conn.TETHER_STATE_CHANGED".equals(intent.getAction())) {
-            TetheringObserver.getInstance().updateUsbTetheringState();
+            Log.d(TAG, "TETHERING TETHER_STATE_CHANGED");
+            TetheringStateManager.updateUsbTetheringState();
+            TetheringStateManager.updateBluetoothTetheringState();
+            TetheringStateManager.updateWifiTetheringState();
         }
     }
 }