[homekit] update AuthInfo objects when blockUserDeletion changes (ope…

…nhab#14017) * [homekit] update AuthInfo objects when blockUserDeletion changes Signed-off-by: Cody Cutrer <[email protected]> * [homekit] general cleanup of redundant method call and unused local vars Signed-off-by: Cody Cutrer <[email protected]> Signed-off-by: Cody Cutrer <[email protected]>
andrewfg · Dec 21, 2022 · 462dca8 · 462dca8
1 parent 672b60b
commit 462dca8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAuthInfoImpl.java b/...openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAuthInfoImpl.java
@@ -57,6 +57,10 @@ public HomekitAuthInfoImpl(Storage<Object> storage, String pin, String setupId,
         initializeStorage();
     }
 
+    public void setBlockUserDeletion(boolean blockUserDeletion) {
+        this.blockUserDeletion = blockUserDeletion;
+    }
+
     @Override
     public void createUser(String username, byte[] publicKey) {
         logger.trace("create user {}", username);

diff --git a/...les/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java b/...les/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
@@ -171,6 +171,11 @@ protected synchronized void modified(Map<String, Object> config) {
                 for (HomekitChangeListener changeListener : changeListeners) {
                     changeListener.updateSettings(settings);
                 }
+                if (settings.blockUserDeletion != oldSettings.blockUserDeletion) {
+                    for (HomekitAuthInfoImpl authInfo : authInfos) {
+                        authInfo.setBlockUserDeletion(settings.blockUserDeletion);
+                    }
+                }
             }
         } catch (IOException | InvalidAlgorithmParameterException e) {
             logger.warn("could not initialize HomeKit bridge: {}", e.getMessage());
@@ -203,10 +208,6 @@ private HomekitRoot startBridge(HomekitServer homekitServer, HomekitAuthInfoImpl
         changeListener.setBridge(bridge);
         bridges.add(bridge);
         bridge.setConfigurationIndex(changeListener.getConfigurationRevision());
-        bridge.refreshAuthInfo();
-
-        final int lastAccessoryCount = changeListener.getLastAccessoryCount();
-        int currentAccessoryCount = changeListener.getAccessories().size();
         bridge.start();
         return bridge;
     }