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

Jump to bottom

[homekit] add support for group switches #7967

Merged
merged 1 commit into from
Jun 24, 2020
Merged

[homekit] add support for group switches #7967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...enhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,9 @@ private void createRootAccessories(Item item) {
final List<Entry<HomekitAccessoryType, HomekitCharacteristicType>> accessoryTypes = HomekitAccessoryFactory
.getAccessoryTypes(item, metadataRegistry);
final List<GroupItem> groups = HomekitAccessoryFactory.getAccessoryGroups(item, itemRegistry, metadataRegistry);
logger.trace("Item {} has groups {}", item.getName(), groups);
if (!accessoryTypes.isEmpty() && groups.isEmpty()) { // it has homekit accessory type and is not part of bigger
// homekit group item
if (!accessoryTypes.isEmpty() && groups.stream().noneMatch(g -> g.getBaseItem() != null)) {
// it has homekit accessory type and is not part of bigger homekit group item without baseItem, i.e. not
// Group:Switch
logger.trace("Item {} is a HomeKit accessory of types {}", item.getName(), accessoryTypes);
final HomekitOHItemProxy itemProxy = new HomekitOHItemProxy(item);
accessoryTypes.stream().forEach(rootAccessory -> createRootAccessory(new HomekitTaggedItem(itemProxy,
Expand Down
3 changes: 2 additions & 1 deletion ...g.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitTaggedItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ public HomekitTaggedItem(HomekitOHItemProxy item, HomekitAccessoryType homekitAc
}

public boolean isGroup() {
return (isAccessory() && (proxyItem.getItem() instanceof GroupItem));
return (isAccessory() && (proxyItem.getItem() instanceof GroupItem)
&& ((GroupItem) proxyItem.getItem()).getBaseItem() == null);
}

public HomekitAccessoryType getAccessoryType() {
Expand Down
2 changes: 1 addition & 1 deletion ...it/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitAccessoryFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ public static List<GroupItem> getAccessoryGroups(Item item, ItemRegistry itemReg
MetadataRegistry metadataRegistry) {
return item.getGroupNames().stream().flatMap(name -> {
Item groupItem = itemRegistry.get(name);
if (groupItem instanceof GroupItem) {
if ((groupItem instanceof GroupItem) && ((GroupItem) groupItem).getBaseItem() == null) {
return Stream.of((GroupItem) groupItem);
} else {
return Stream.empty();
Expand Down