Merge lp:~kzapalowicz/ubuntu-system-settings/ubuntu-system-settings into lp:ubuntu-system-settings

[Konrad Zapałowicz]

bluetooth: Add Apperance characteristic to type conversion

The Bluetooth LE devices use the GATT Apperance characteristic
instead of the CoD field to introduce themselves. So far the
Bluetooth plugin for u-s-s have not read it and as a result
the BLE devices were invisible on the found devices list. This
change allows them to be visible as right now the type of
device is also guessed based on the Apperance property.

bluetooth: Add Apperance characteristic to type conversion

The Bluetooth LE devices use the GATT Apperance characteristic
instead of the CoD field to introduce themselves. So far the
Bluetooth plugin for u-s-s have not read it and as a result
the BLE devices were invisible on the found devices list. This
change allows them to be visible as right now the type of
device is also guessed based on the Apperance property.

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== modified file 'plugins/bluetooth/device.cpp'
--- plugins/bluetooth/device.cpp	2016-03-11 07:15:54 +0000
+++ plugins/bluetooth/device.cpp	2016-07-28 10:14:29 +0000
@@ -373,6 +373,8 @@
         updateConnection();
     } else if (key == "Class") {
         setType(getTypeFromClass(value.toUInt()));
+    } else if (key == "Appearance") {
+        setType(getTypeFromAppearance(value.toUInt()));
     } else if (key == "Paired") {
         setPaired(value.toBool());
 
@@ -393,6 +395,22 @@
     }
 }
 
+/* Determine the Type from the bits in the Appearance field.
+   https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.gap.appearance.xml */
+Device::Type Device::getTypeFromAppearance(quint32 c)
+{
+    /* is it a HID class device? */
+    if (c & 0x03C0) {
+        switch (c & 0x000f) {
+        case 0x1:
+            return Type::Keyboard;
+        case 0x02:
+            return Type::Mouse;
+        }
+    }
+    return Type::Other;
+}
+
 /* Determine the Type from the bits in the Class of Device (CoD) field.
    https://www.bluetooth.org/en-us/specification/assigned-numbers/baseband */
 Device::Type Device::getTypeFromClass (quint32 c)

=== modified file 'plugins/bluetooth/device.h'
--- plugins/bluetooth/device.h	2015-11-12 09:53:00 +0000
+++ plugins/bluetooth/device.h	2016-07-28 10:14:29 +0000
@@ -161,6 +161,7 @@
     void updateProperties(QSharedPointer<QDBusInterface>);
     void updateProperty(const QString &key, const QVariant &value);
     static Type getTypeFromClass(quint32 bluetoothClass);
+    static Type getTypeFromAppearance(quint32 bluetoothClass);
     Device::Strength getStrengthFromRssi(int rssi);
     void connectAfterPairing();
 };