Merge pull request #82 from IOT-DSA/feature/Update-QOS-onChange

Resolve issue with QOS downgrades.

Author: butlermatt

CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+* v1.0.5 - Ensure that QOS downgrades are propagated.
+* v1.0.4+1 - Map logger names to match DSA log levels.
+* v1.0.4 - Forward any errors generated by a `list` request to the requester.
+* v1.0.3 - Update packages to use hosted rather than repository sources.
 * v1.0.2 - Properly forward QOS level changes to nodes when changing an existing subscription QOS level.
 * v1.0.1 - Fix bug in list subscriptions for nodes which have been removed and recreated throughout subscription's life.
            This may have prevented list subscriptions from updating full entries. 

lib/src/requester/request/subscribe.dart

@@ -265,23 +265,13 @@ class ReqSubscribeController {
   }
 
   void listen(callback(ValueUpdate update), int qos) {
-    if (qos < 0 || qos > 3) {
-      qos = 0;
-    }
-    bool qosChanged = false;
+    qos = qos.clamp(0, 3);
 
-    if (callbacks.containsKey(callback)) {
-      callbacks[callback] = qos;
-      qosChanged = updateQos();
-    } else {
-      callbacks[callback] = qos;
-      if (qos > currentQos) {
-        qosChanged = true;
-        currentQos = qos;
-      }
-      if (_lastUpdate != null) {
-        callback(_lastUpdate);
-      }
+    callbacks[callback] = qos;
+    bool qosChanged = updateQos();
+
+    if (_lastUpdate != null) {
+      callback(_lastUpdate);
     }
 
     if (qosChanged) {

lib/src/responder/response/subscribe.dart

@@ -207,9 +207,8 @@ class RespSubscribeController {
   ISubscriptionNodeStorage _storage;
 
   void set qosLevel(int v) {
-    if (v < 0 || v > 3) v = 0;
-    if (_qosLevel == v)
-      return;
+    v = v.clamp(0, 3);
+    if (_qosLevel == v) return;
 
     _qosLevel = v;
     if (waitingValues == null && _qosLevel > 0) {

pubspec.yaml

@@ -1,5 +1,5 @@
 name: dslink
-version: 1.0.4+1
+version: 1.0.5
 description: "DSA IoT Platform - DSLink SDK for Dart"
 homepage: "http://iot-dsa.org"
 documentation: "https://iot-dsa.github.io/docs/sdks/dart/"