fix compilation

Author: yunhanw-google

src/app/InteractionModelEngine.cpp

@@ -1077,7 +1077,8 @@ void InteractionModelEngine::OnActiveModeNotification(ScopedNodeId aCheckInNode,
         // It is possible that pListItem is destroyed by the app in OnActiveModeNotification.
         // Get the next item before invoking `OnActiveModeNotification`.
         if (ScopedNodeId(pListItem->GetPeerNodeId(), pListItem->GetFabricIndex()) == aPeer && 
-            aCheckInNode == pListItem->GetLocalScopedNodeId())
+            pListItem->GetLocalScopedNodeId().HasValue() &&
+            aCheckInNode == pListItem->GetLocalScopedNodeId().Value())
         {
             pListItem->OnActiveModeNotification();
         }

src/app/ReadClient.cpp

@@ -488,7 +488,7 @@ void ReadClient::OnActiveModeNotification()
 
     // Note: this API only works when issuing subscription via SendAutoResubscribeRequest, when SendAutoResubscribeRequest is called,
     // either mEventPathParamsListSize or mAttributePathParamsListSize is not 0.
-    VerifyOrDie(mReadPrepareParams.mEventPathParamsListSize != 0 || mReadPrepareParams.mAttributePathParamsListSize != 0)
+    VerifyOrDie(mReadPrepareParams.mEventPathParamsListSize != 0 || mReadPrepareParams.mAttributePathParamsListSize != 0);
 
     // When we reach here, the subscription definitely exceeded the liveness timeout. Just continue the unfinished resubscription
     // logic in `OnLivenessTimeoutCallback`.

src/app/ReadClient.h

@@ -511,7 +511,7 @@ class ReadClient : public Messaging::ExchangeDelegate
 
     Optional<ScopedNodeId> GetLocalScopedNodeId() const 
     { 
-        VerifyOrReturnValue(aReadPrepareParams.mSessionHolder, NullOptional);
+        VerifyOrReturnValue(mReadPrepareParams.mSessionHolder, NullOptional);
         return MakeOptional(mReadPrepareParams.mSessionHolder->AsSecureSession()->GetLocalScopedNodeId()); 
     }
 

src/app/icd/client/RefreshKeySender.cpp

@@ -69,7 +69,7 @@ CHIP_ERROR RefreshKeySender::RegisterClientWithNewKey(Messaging::ExchangeManager
 
         mpCheckInDelegate->OnCheckInComplete(mICDClientInfo);
 #if CHIP_CONFIG_ENABLE_READ_CLIENT
-        mpImEngine->OnActiveModeNotification(mICDClientInfo.peer_node);
+        mpImEngine->OnActiveModeNotification(mICDClientInfo.check_in_node, mICDClientInfo.peer_node);
 #endif // CHIP_CONFIG_ENABLE_READ_CLIENT
         mpCheckInDelegate->OnKeyRefreshDone(this, CHIP_NO_ERROR);
     };

src/controller/tests/data_model/TestRead.cpp

@@ -2392,7 +2392,7 @@ TEST_F(TestRead, TestSubscribeFailed_OnActiveModeNotification)
 
         GetLoopback().mNumMessagesToDrop = 0;
         callback.ClearCounters();
-        InteractionModelEngine::GetInstance()->OnActiveModeNotification(
+        InteractionModelEngine::GetInstance()->OnActiveModeNotification(readClient.GetLocalScopedNodeId().Value(),
             ScopedNodeId(readClient.GetPeerNodeId(), readClient.GetFabricIndex()));
         //
         // Drive servicing IO till we have established a subscription.