Fix MinInterval handling in ReadClient.

We had codepaths on which we did not store MinInterval for an outgoing subscribe request, and would later report the wrong MinInterval.
project-chip · Jun 22, 2022 · d841a01 · d841a01
1 parent d1a4bb7
commit d841a01
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp
@@ -865,14 +865,15 @@ CHIP_ERROR ReadClient::SendSubscribeRequest(const ReadPrepareParams & aReadPrepa
 {
     VerifyOrReturnError(aReadPrepareParams.mMinIntervalFloorSeconds <= aReadPrepareParams.mMaxIntervalCeilingSeconds,
                         CHIP_ERROR_INVALID_ARGUMENT);
-    mMinIntervalFloorSeconds = aReadPrepareParams.mMinIntervalFloorSeconds;
     return SendSubscribeRequestImpl(aReadPrepareParams);
 }
 
 CHIP_ERROR ReadClient::SendSubscribeRequestImpl(const ReadPrepareParams & aReadPrepareParams)
 {
     VerifyOrReturnError(ClientState::Idle == mState, CHIP_ERROR_INCORRECT_STATE);
 
+    mMinIntervalFloorSeconds = aReadPrepareParams.mMinIntervalFloorSeconds;
+
     // Todo: Remove the below, Update span in ReadPrepareParams
     Span<AttributePathParams> attributePaths(aReadPrepareParams.mpAttributePathParamsList,
                                              aReadPrepareParams.mAttributePathParamsListSize);