fix(network): get rid of obsolete bleState (no 'incompatible' state a…

…nymore)
berty · Apr 10, 2019 · b295b2a · b295b2a
1 parent 6c7dca6
commit b295b2a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 31 deletions.
diff --git a/client/react-native/android/app/src/main/java/chat/berty/core/ConnectivityUpdateHandler.java b/client/react-native/android/app/src/main/java/chat/berty/core/ConnectivityUpdateHandler.java
@@ -25,6 +25,10 @@
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class ConnectivityUpdateHandler extends BroadcastReceiver {
     private static String TAG = "connectivity_update_handler";
+    private static final short
+            STATE_ON      = 1,
+            STATE_OFF     = 2;
+
 
     ConnectivityUpdateHandler(ReactApplicationContext reactContext) {
         super();
@@ -53,10 +57,6 @@ public void onReceive(Context context, Intent intent) {
     }
 
     private static final void updateConnectivity(Context context) {
-        final short
-                STATE_ON      = 1,
-                STATE_OFF     = 2;
-
         ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         Network currentNet;
         NetworkCapabilities currentNetCap;
@@ -212,10 +212,6 @@ private static final String getTypeString(Context context) {
     }
 
     private static final void updateBLE(int state) {
-        final short
-                STATE_ON  = 1,
-                STATE_OFF = 2;
-
         if(isBleAdvAndScanCompatible() && state == BluetoothAdapter.STATE_ON)
             Core.updateBluetoothState(STATE_ON);
         else if(state == BluetoothAdapter.STATE_OFF)

diff --git a/core/network/state/notifee.go b/core/network/state/notifee.go
@@ -15,7 +15,7 @@ type Notifee interface {
 	HandleTrustedChange(State)
 	HandleNetTypeChange(NetType)
 	HandleCellTypeChange(CellType)
-	HandleBluetoothChange(BleState)
+	HandleBluetoothChange(State)
 }
 
 type notifier struct {
@@ -35,7 +35,7 @@ func (nr *notifier) notifyConnectivityChange(cs ConnectivityState) {
 		zap.String("Trusted", StateToString(cs.Trusted)),
 		zap.String("Network", NetTypeToString(cs.Network)),
 		zap.String("Cellular", CellTypeToString(cs.Cellular)),
-		zap.String("Bluetooth", BleStateToString(cs.Bluetooth)),
+		zap.String("Bluetooth", StateToString(cs.Bluetooth)),
 	)
 	for _, notifee := range nr.notifees {
 		notifee.HandleConnectivityChange(cs)
@@ -132,10 +132,10 @@ func (nr *notifier) notifyCellTypeChange(c CellType) {
 	nr.lock.Unlock()
 }
 
-func (nr *notifier) notifyBluetoothChange(b BleState) {
+func (nr *notifier) notifyBluetoothChange(b State) {
 	nr.lock.Lock()
 
-	logger().Debug("notify bluetooth state change:", zap.String("new state", BleStateToString(b)))
+	logger().Debug("notify bluetooth state change:", zap.String("new state", StateToString(b)))
 	for _, notifee := range nr.notifees {
 		notifee.HandleBluetoothChange(b)
 	}

diff --git a/core/network/state/state.go b/core/network/state/state.go
@@ -21,10 +21,6 @@ const (
 	Cell2G          CellType = 2
 	Cell3G          CellType = 3
 	Cell4G          CellType = 4
-
-	UnknownBleState BleState = 0
-	BleOn           BleState = 1
-	BleOff          BleState = 2
 )
 
 type ConnectivityState struct {
@@ -36,7 +32,7 @@ type ConnectivityState struct {
 	Trusted   State
 	Network   NetType
 	Cellular  CellType
-	Bluetooth BleState
+	Bluetooth State
 }
 
 func StateToString(s State) string {
@@ -79,14 +75,3 @@ func CellTypeToString(c CellType) string {
 		return "unknown"
 	}
 }
-
-func BleStateToString(b BleState) string {
-	switch b {
-	case BleOn:
-		return "on"
-	case BleOff:
-		return "off"
-	default:
-		return "unknown"
-	}
-}
diff --git a/core/network/state/updater.go b/core/network/state/updater.go
@@ -105,9 +105,9 @@ func (nu *NetworkUpdater) UpdateConnectivityState(connState string) {
 func (nu *NetworkUpdater) UpdateBluetoothState(bleState int) {
 	nu.lock.Lock()
 
-	if BleState(bleState) != nu.state.Bluetooth {
-		nu.state.Bluetooth = BleState(bleState)
-		nu.notif.notifyBluetoothChange(BleState(bleState))
+	if State(bleState) != nu.state.Bluetooth {
+		nu.state.Bluetooth = State(bleState)
+		nu.notif.notifyBluetoothChange(State(bleState))
 		nu.notif.notifyConnectivityChange(nu.state)
 	}