[General Commissioning Server] Dynamically encode the feature map 'GeneralCommissioning::Feature::kTermsAndConditions' if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED is set

vivien-apple · vivien-apple · commit bf5636f76db5 · 2025-01-20T18:15:30.000+01:00
diff --git a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
@@ -107,6 +107,14 @@ CHIP_ERROR GeneralCommissioningGlobalInstance::Read(const ConcreteReadAttributeP
 
     switch (aPath.mAttributeId)
     {
+    case FeatureMap::Id: {
+        BitFlags<GeneralCommissioning::Feature> features;
+#if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
+        features.Set(GeneralCommissioning::Feature::kTermsAndConditions);
+#endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
+        return aEncoder.Encode(features);
+    }
+
     case RegulatoryConfig::Id: {
         return ReadIfSupported(&ConfigurationManager::GetRegulatoryLocation, aEncoder);
     }

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,14 @@ CHIP_ERROR GeneralCommissioningGlobalInstance::Read(const ConcreteReadAttributeP`
`107`	`107`
`108`	`108`	`switch (aPath.mAttributeId)`
`109`	`109`	`{`
	`110`	`+ case FeatureMap::Id: {`
	`111`	`+ BitFlags<GeneralCommissioning::Feature> features;`
	`112`	`+#if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED`
	`113`	`+ features.Set(GeneralCommissioning::Feature::kTermsAndConditions);`
	`114`	`+#endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED`
	`115`	`+ return aEncoder.Encode(features);`
	`116`	`+ }`
	`117`	`+`
`110`	`118`	`case RegulatoryConfig::Id: {`
`111`	`119`	`return ReadIfSupported(&ConfigurationManager::GetRegulatoryLocation, aEncoder);`
`112`	`120`	`}`