public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[homekit] update AuthInfo objects when blockUserDeletion changes (#14017)

Browse Source 
* [homekit] update AuthInfo objects when blockUserDeletion changes

Signed-off-by: Cody Cutrer <cody@cutrer.us>

* [homekit] general cleanup of redundant method call and unused local vars

Signed-off-by: Cody Cutrer <cody@cutrer.us>

Signed-off-by: Cody Cutrer <cody@cutrer.us>
This commit is contained in:
Cody Cutrer 2022-12-21 16:31:05 -07:00 committed by GitHub
parent 672b60b1d9
commit 462dca8040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAuthInfoImpl.java
View File

@ -57,6 +57,10 @@ public class HomekitAuthInfoImpl implements HomekitAuthInfo {
initializeStorage(); initializeStorage();
} }
public void setBlockUserDeletion(boolean blockUserDeletion) {
this.blockUserDeletion = blockUserDeletion;
}
@Override @Override
public void createUser(String username, byte[] publicKey) { public void createUser(String username, byte[] publicKey) {
logger.trace("create user {}", username); logger.trace("create user {}", username);

9
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
View File

@ -171,6 +171,11 @@ public class HomekitImpl implements Homekit, NetworkAddressChangeListener, Ready
for (HomekitChangeListener changeListener : changeListeners) { for (HomekitChangeListener changeListener : changeListeners) {
changeListener.updateSettings(settings); changeListener.updateSettings(settings);
} }
if (settings.blockUserDeletion != oldSettings.blockUserDeletion) {
for (HomekitAuthInfoImpl authInfo : authInfos) {
authInfo.setBlockUserDeletion(settings.blockUserDeletion);
}
}
} }
} catch (IOException | InvalidAlgorithmParameterException e) { } catch (IOException | InvalidAlgorithmParameterException e) {
logger.warn("could not initialize HomeKit bridge: {}", e.getMessage()); logger.warn("could not initialize HomeKit bridge: {}", e.getMessage());
@ -203,10 +208,6 @@ public class HomekitImpl implements Homekit, NetworkAddressChangeListener, Ready
changeListener.setBridge(bridge); changeListener.setBridge(bridge);
bridges.add(bridge); bridges.add(bridge);
bridge.setConfigurationIndex(changeListener.getConfigurationRevision()); bridge.setConfigurationIndex(changeListener.getConfigurationRevision());
bridge.refreshAuthInfo();
final int lastAccessoryCount = changeListener.getLastAccessoryCount();
int currentAccessoryCount = changeListener.getAccessories().size();
bridge.start(); bridge.start();
return bridge; return bridge;
} }