Fix wasModified logic check for optional OSD and WMark.

Author: pidarped

src/app/clusters/camera-av-stream-management-server/camera-av-stream-management-server.cpp

@@ -1004,15 +1004,12 @@ void CameraAVStreamMgmtServer::ModifyVideoStream(const uint16_t streamID, const
             bool wasModified = false;
             if (waterMarkEnabled.HasValue())
             {
-                wasModified = (stream.watermarkEnabled.HasValue() != waterMarkEnabled.HasValue()) ||
-                    (stream.watermarkEnabled.HasValue() && waterMarkEnabled.HasValue() &&
-                     stream.watermarkEnabled.Value() != waterMarkEnabled.Value());
+                wasModified = !stream.watermarkEnabled.HasValue() || stream.watermarkEnabled.Value() != waterMarkEnabled.Value();
                 stream.watermarkEnabled = waterMarkEnabled;
             }
             if (osdEnabled.HasValue())
             {
-                wasModified = wasModified || (stream.OSDEnabled.HasValue() != osdEnabled.HasValue()) ||
-                    (stream.OSDEnabled.HasValue() && osdEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value());
+                wasModified       = wasModified || !stream.OSDEnabled.HasValue() || stream.OSDEnabled.Value() != osdEnabled.Value();
                 stream.OSDEnabled = osdEnabled;
             }
             if (wasModified)
@@ -1035,15 +1032,12 @@ void CameraAVStreamMgmtServer::ModifySnapshotStream(const uint16_t streamID, con
             bool wasModified = false;
             if (waterMarkEnabled.HasValue())
             {
-                wasModified = (stream.watermarkEnabled.HasValue() != waterMarkEnabled.HasValue()) ||
-                    (stream.watermarkEnabled.HasValue() && waterMarkEnabled.HasValue() &&
-                     stream.watermarkEnabled.Value() != waterMarkEnabled.Value());
+                wasModified = !stream.watermarkEnabled.HasValue() || stream.watermarkEnabled.Value() != waterMarkEnabled.Value();
                 stream.watermarkEnabled = waterMarkEnabled;
             }
             if (osdEnabled.HasValue())
             {
-                wasModified = wasModified || (stream.OSDEnabled.HasValue() != osdEnabled.HasValue()) ||
-                    (stream.OSDEnabled.HasValue() && osdEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value());
+                wasModified       = wasModified || !stream.OSDEnabled.HasValue() || stream.OSDEnabled.Value() != osdEnabled.Value();
                 stream.OSDEnabled = osdEnabled;
             }
             if (wasModified)

src/python_testing/TC_AVSMTestBase.py

@@ -27,7 +27,7 @@
 logger = logging.getLogger(__name__)
 
 
-def wmark_osd_matcher(attribute_id: int, wmark: bool, osd: bool, wmark_check: bool, osd_check: bool) -> "AttributeMatcher":
+def wmark_osd_matcher(attribute_id: int, wmark: bool | None, osd: bool | None, wmark_check: bool, osd_check: bool) -> "AttributeMatcher":
     def predicate(report: AttributeValue) -> bool:
         if report.attribute != attribute_id:
             return False