Emit QBluetoothDeviceDiscoveryAgent::deviceUpdated on Apple platforms

Also update TODO and note to indicate support for Apple platforms.

Task-number: QTBUG-46008
Change-Id: I69eaf83b728283ba766553c3e57dbaab30b57e0a
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

3 files changed, 77 insertions, 9 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
index 8a5772c4..e69dcce3 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
@@ -171,12 +171,12 @@ Q_DECLARE_LOGGING_CATEGORY(QT_BT)
     This signal informs you that if your application is displaying this data, it
     can be updated, rather than waiting until the discovery has finished.
 
-    \note This signal is only emitted on Android and BlueZ 5.x.
+    \note This signal is only emitted on Android, iOS, macOS, and BlueZ 5.x.
 
     \sa QBluetoothDeviceInfo::rssi(), lowEnergyDiscoveryTimeout()
 */
 
-// TODO deviceUpdated() signal not implemented on WinRT and Apple platforms
+// TODO deviceUpdated() signal not implemented on WinRT
 
 /*!
     \fn void QBluetoothDeviceDiscoveryAgent::finished()
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm
index c50d546d..059f244d 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm
@@ -253,11 +253,40 @@ void QBluetoothDeviceDiscoveryAgentPrivate::LEdeviceFound(const QBluetoothDevice
     // Update, append or discard.
     for (int i = 0, e = discoveredDevices.size(); i < e; ++i) {
         if (discoveredDevices[i].deviceUuid() == newDeviceInfo.deviceUuid()) {
-            if (discoveredDevices[i] == newDeviceInfo)
+            QBluetoothDeviceInfo::Fields updatedFields = QBluetoothDeviceInfo::Field::None;
+            if (discoveredDevices[i].rssi() != newDeviceInfo.rssi()) {
+                qCDebug(QT_BT_OSX) << "Updating RSSI for" << newDeviceInfo.address()
+                                   << newDeviceInfo.rssi();
+                discoveredDevices[i].setRssi(newDeviceInfo.rssi());
+                updatedFields.setFlag(QBluetoothDeviceInfo::Field::RSSI);
+            }
+
+            if (discoveredDevices[i].manufacturerData() != newDeviceInfo.manufacturerData()) {
+                qCDebug(QT_BT_OSX) << "Updating manufacturer data for" << newDeviceInfo.address();
+                const QVector<quint16> keys = newDeviceInfo.manufacturerIds();
+                for (auto key: keys)
+                    discoveredDevices[i].setManufacturerData(key, newDeviceInfo.manufacturerData(key));
+                updatedFields.setFlag(QBluetoothDeviceInfo::Field::ManufacturerData);
+            }
+
+            if (lowEnergySearchTimeout > 0) {
+                if (discoveredDevices[i] != newDeviceInfo) {
+                    discoveredDevices.replace(i, newDeviceInfo);
+                    emit q_ptr->deviceDiscovered(newDeviceInfo);
+                } else {
+                    if (!updatedFields.testFlag(QBluetoothDeviceInfo::Field::None))
+                        emit q_ptr->deviceUpdated(discoveredDevices[i], updatedFields);
+                }
+
                 return;
+            }
 
             discoveredDevices.replace(i, newDeviceInfo);
             emit q_ptr->deviceDiscovered(newDeviceInfo);
+
+            if (!updatedFields.testFlag(QBluetoothDeviceInfo::Field::None))
+                emit q_ptr->deviceUpdated(discoveredDevices[i], updatedFields);
+
             return;
         }
     }
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
index 3cf3b08d..f62ca0dd 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
@@ -525,14 +525,53 @@ void QBluetoothDeviceDiscoveryAgentPrivate::deviceFound(const QBluetoothDeviceIn
     const bool isLE = newDeviceInfo.coreConfigurations() == QBluetoothDeviceInfo::LowEnergyCoreConfiguration;
 
     for (int i = 0, e = discoveredDevices.size(); i < e; ++i) {
-        if (isLE ? discoveredDevices[i].deviceUuid() == newDeviceInfo.deviceUuid():
-                   discoveredDevices[i].address() == newDeviceInfo.address()) {
-            if (discoveredDevices[i] == newDeviceInfo && (!isLE || lowEnergySearchTimeout > 0))
+        if (isLE) {
+            if (discoveredDevices[i].deviceUuid() == newDeviceInfo.deviceUuid()) {
+                QBluetoothDeviceInfo::Fields updatedFields = QBluetoothDeviceInfo::Field::None;
+                if (discoveredDevices[i].rssi() != newDeviceInfo.rssi()) {
+                    qCDebug(QT_BT_OSX) << "Updating RSSI for" << newDeviceInfo.address()
+                                       << newDeviceInfo.rssi();
+                    discoveredDevices[i].setRssi(newDeviceInfo.rssi());
+                    updatedFields.setFlag(QBluetoothDeviceInfo::Field::RSSI);
+                }
+
+                if (discoveredDevices[i].manufacturerData() != newDeviceInfo.manufacturerData()) {
+                    qCDebug(QT_BT_OSX) << "Updating manufacturer data for" << newDeviceInfo.address();
+                    const QVector<quint16> keys = newDeviceInfo.manufacturerIds();
+                    for (auto key: keys)
+                        discoveredDevices[i].setManufacturerData(key, newDeviceInfo.manufacturerData(key));
+                    updatedFields.setFlag(QBluetoothDeviceInfo::Field::ManufacturerData);
+                }
+
+                if (lowEnergySearchTimeout > 0) {
+                    if (discoveredDevices[i] != newDeviceInfo) {
+                        discoveredDevices.replace(i, newDeviceInfo);
+                        emit q_ptr->deviceDiscovered(newDeviceInfo);
+                    } else {
+                        if (!updatedFields.testFlag(QBluetoothDeviceInfo::Field::None))
+                            emit q_ptr->deviceUpdated(discoveredDevices[i], updatedFields);
+                    }
+
+                    return;
+                }
+
+                discoveredDevices.replace(i, newDeviceInfo);
+                emit q_ptr->deviceDiscovered(newDeviceInfo);
+
+                if (!updatedFields.testFlag(QBluetoothDeviceInfo::Field::None))
+                    emit q_ptr->deviceUpdated(discoveredDevices[i], updatedFields);
+
                 return;
+            }
+        } else {
+            if (discoveredDevices[i].address() == newDeviceInfo.address()) {
+                if (discoveredDevices[i] == newDeviceInfo)
+                    return;
 
-            discoveredDevices.replace(i, newDeviceInfo);
-            emit q_ptr->deviceDiscovered(newDeviceInfo);
-            return;
+                discoveredDevices.replace(i, newDeviceInfo);
+                emit q_ptr->deviceDiscovered(newDeviceInfo);
+                return;
+            }
         }
     }