Introduce minor improvements

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'com.valashko.xaapi'
-version '0.4'
+version '0.5'
 
 sourceCompatibility = 1.8
 
@@ -12,6 +12,6 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.code.gson:gson:2.8.+'
+    implementation 'com.google.code.gson:gson:2.8.5'
 }
 

src/main/java/com/valashko/xaapi/device/BuiltinDevice.java

@@ -11,12 +11,18 @@ public enum Type {
     }
 
     protected static JsonParser JSON_PARSER = new JsonParser();
+    private String uid;
     private Type type;
 
-    public BuiltinDevice(Type type) {
+    public BuiltinDevice(String uid, Type type) {
+        this.uid = uid;
         this.type = type;
     }
 
+    public String getUid() {
+        return uid;
+    }
+
     public Type getType() {
         return type;
     }

src/main/java/com/valashko/xaapi/device/XiaomiGateway.java

@@ -60,8 +60,8 @@ public static XiaomiGateway discover() throws IOException, XaapiException {
     public XiaomiGateway(String ip) throws IOException, XaapiException {
         this.incomingMulticastChannel = new IncomingMulticastChannel(GROUP, PORT);
         this.directChannel = new DirectChannel(ip, PORT);
-        configureBuiltinDevices();
         queryDevices();
+        configureBuiltinDevices();
     }
     public XiaomiGateway(String ip, String password) throws IOException, XaapiException {
         this(ip);
@@ -77,8 +77,8 @@ public Map<String, SlaveDevice> getKnownDevices() {
     }
 
     private void configureBuiltinDevices() {
-        builtinLight = new XiaomiGatewayLight();
-        builtinIlluminationSensor = new XiaomiGatewayIlluminationSensor();
+        builtinLight = new XiaomiGatewayLight(sid);
+        builtinIlluminationSensor = new XiaomiGatewayIlluminationSensor(sid);
     }
 
     private void configureCipher(String password) throws XaapiException {

src/main/java/com/valashko/xaapi/device/XiaomiGatewayIlluminationSensor.java

@@ -11,8 +11,8 @@ public class XiaomiGatewayIlluminationSensor extends BuiltinDevice {
     private int illumination;
     private HashMap<IInteractiveDevice.SubscriptionToken, Consumer<Integer>> illuminationChangeCallbacks = new HashMap<>();
 
-    public XiaomiGatewayIlluminationSensor() {
-        super(Type.XiaomiGatewayIlluminationSensor);
+    public XiaomiGatewayIlluminationSensor(String gatewaySid) {
+        super(gatewaySid + ":illumination", Type.XiaomiGatewayIlluminationSensor);
     }
 
     @Override

src/main/java/com/valashko/xaapi/device/XiaomiGatewayLight.java

@@ -10,8 +10,8 @@ public class XiaomiGatewayLight extends BuiltinDevice {
     private byte brightness;
     private Color color;
 
-    public XiaomiGatewayLight() {
-        super(Type.XiaomiGatewayLight);
+    public XiaomiGatewayLight(String gatewaySid) {
+        super(gatewaySid + ":light", Type.XiaomiGatewayLight);
     }
 
     @Override

src/main/java/com/valashko/xaapi/device/XiaomiMotionSensor.java

@@ -16,6 +16,7 @@ public enum Action {
 
     private Action lastAction;
     private HashMap<SubscriptionToken, Consumer<String>> actionsCallbacks = new HashMap<>();
+    private HashMap<SubscriptionToken, Runnable> motionCallbacks = new HashMap<>();
 
     XiaomiMotionSensor(XiaomiGateway gateway, String sid) {
         super(gateway, sid, Type.XiaomiMotionSensor);
@@ -30,6 +31,7 @@ void update(String data) {
                 switch(action) {
                     case "motion":
                         lastAction = Action.Motion;
+                        notifyWithMotion();
                         break;
                     default:
                         throw new XaapiException("Unknown action: " + action);
@@ -51,4 +53,20 @@ public Map<SubscriptionToken, Consumer<String>> getActionsCallbacks() {
     public Action getLastAction() {
         return lastAction;
     }
+
+    public SubscriptionToken subscribeForMotion(Runnable callback) {
+        SubscriptionToken token = new SubscriptionToken();
+        motionCallbacks.put(token, callback);
+        return token;
+    }
+
+    public void unsubscribeForMotion(SubscriptionToken token) {
+        motionCallbacks.remove(token);
+    }
+
+    private void notifyWithMotion() {
+        for(Runnable r : motionCallbacks.values()) {
+            r.run();
+        }
+    }
 }