Merge branch 'master' into camera-webrtc-server

Author: gmarcosb

scripts/setup/zap.json

@@ -8,13 +8,13 @@
                 "mac-amd64",
                 "windows-amd64"
             ],
-            "tags": ["version:2@v2024.10.24-nightly.1"]
+            "tags": ["version:2@v2025.01.10-nightly.1"]
         },
         {
             "_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
             "path": "fuchsia/third_party/zap/mac-amd64",
             "platforms": ["mac-arm64"],
-            "tags": ["version:2@v2024.10.24-nightly.1"]
+            "tags": ["version:2@v2025.01.10-nightly.1"]
         }
     ]
 }

scripts/setup/zap.version

@@ -1 +1 @@
-v2024.10.24-nightly
+v2025.01.10-nightly

scripts/tools/zap/zap_execution.py

@@ -23,7 +23,7 @@
 # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
 # files may need updating for versions
 #
-MIN_ZAP_VERSION = '2024.10.24'
+MIN_ZAP_VERSION = '2025.1.10'
 
 
 class ZapTool:

src/app/server/DefaultTermsAndConditionsProvider.cpp

@@ -211,7 +211,9 @@ CHIP_ERROR chip::app::DefaultTermsAndConditionsProvider::GetAcknowledgementsRequ
 
     TermsAndConditions requiredTermsAndConditions = requiredTermsAndConditionsMaybe.Value();
     TermsAndConditions acceptedTermsAndConditions = acceptedTermsAndConditionsMaybe.Value();
-    outAcknowledgementsRequired                   = requiredTermsAndConditions.Validate(acceptedTermsAndConditions);
+
+    bool requiredTermsAndConditionsAreAccepted = requiredTermsAndConditions.Validate(acceptedTermsAndConditions);
+    outAcknowledgementsRequired                = !requiredTermsAndConditionsAreAccepted;
     return CHIP_NO_ERROR;
 }