2 files changed, 21 insertions, 10 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringObservable.java b/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringObservable.java
index 9ea9160f..fc06ee12 100644
--- a/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringObservable.java
+++ b/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringObservable.java
@@ -21,11 +21,11 @@ import java.util.Observable;
 public class TetheringObservable extends Observable {
     private static TetheringObservable instance;
 
-    private boolean isWifiTetheringEnabled;
-    private boolean isUsbTetheringEnabled;
-    private boolean isBluetoothTetheringEnabled;
+    private TetheringState tetheringState;
 
-    private TetheringObservable() { }
+    private TetheringObservable() {
+        tetheringState = new TetheringState();
+    }
 
     public static TetheringObservable getInstance() {
         if (instance == null) {
@@ -35,32 +35,36 @@ public class TetheringObservable extends Observable {
     }
 
     static void setWifiTethering(boolean enabled) {
-        getInstance().isWifiTetheringEnabled = enabled;
+        getInstance().tetheringState.isWifiTetheringEnabled = enabled;
         getInstance().setChanged();
         getInstance().notifyObservers();
     }
 
     static void setUsbTethering(boolean enabled) {
-        getInstance().isUsbTetheringEnabled = enabled;
+        getInstance().tetheringState.isUsbTetheringEnabled = enabled;
         getInstance().setChanged();
         getInstance().notifyObservers();
     }
 
     static void setBluetoothTethering(boolean enabled) {
-        getInstance().isBluetoothTetheringEnabled = enabled;
+        getInstance().tetheringState.isBluetoothTetheringEnabled = enabled;
         getInstance().setChanged();
         getInstance().notifyObservers();
     }
 
     public boolean isBluetoothTetheringEnabled() {
-        return isBluetoothTetheringEnabled;
+        return tetheringState.isBluetoothTetheringEnabled;
     }
 
     public boolean isUsbTetheringEnabled() {
-        return isUsbTetheringEnabled;
+        return tetheringState.isUsbTetheringEnabled;
     }
 
     public boolean isWifiTetheringEnabled() {
-        return isWifiTetheringEnabled;
+        return tetheringState.isWifiTetheringEnabled;
+    }
+
+    public TetheringState getTetheringState() {
+        return tetheringState;
     }
 }
diff --git a/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringState.java b/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringState.java
new file mode 100644
index 00000000..50fead91
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/tethering/TetheringState.java
@@ -0,0 +1,7 @@
+package se.leap.bitmaskclient.tethering;
+
+public class TetheringState {
+    public boolean isWifiTetheringEnabled;
+    public boolean isUsbTetheringEnabled;
+    public boolean isBluetoothTetheringEnabled;
+}