Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bluetooth] Fix disappearing bluetooth devices in Inbox #10187

Merged
merged 2 commits into from
Feb 25, 2021
+13 −0
Merged

[bluetooth] Fix disappearing bluetooth devices in Inbox #10187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cda3ad
[bluetooth] Notify things again when they are removed from listeners …
PRosenb Jan 13, 2021
f46bd15
[bluetooth] Add javadoc on retractDiscoveryResult()
PRosenb Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ...main/java/org/openhab/binding/bluetooth/discovery/internal/BluetoothDiscoveryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,13 @@ public void stopScan() {
for (BluetoothAdapter adapter : adapters) {
adapter.scanStop();
}

// The method `removeOlderResults()` removes the Things from listeners like `Inbox`.
// We therefore need to reset `latestSnapshot` so that the Things are notified again next time.
// Results newer than `getTimestampOfLastScan()` will also be notified again but do not lead to duplicates.
discoveryCaches.values().forEach(discoveryCache -> {
discoveryCache.latestSnapshot.putValue(null);
});
removeOlderResults(getTimestampOfLastScan());
}

Expand Down Expand Up @@ -294,6 +301,12 @@ private void publishDiscoveryResult(BluetoothAdapter adapter, DiscoveryResult re
discoveryResults.put(adapter, results);
}

/**
* Called when a new discovery is published and thus requires the old discovery to be removed first.
*
* @param adapter to get the results to be removed
* @param result unused
*/
private void retractDiscoveryResult(BluetoothAdapter adapter, DiscoveryResult result) {
Set<DiscoveryResult> results = discoveryResults.remove(adapter);
if (results != null) {
Expand Down