Appplied change to method name and fixe condition in SetStateFlag

project-chip · Aug 10, 2023 · 6a6806f · 6a6806f
1 parent 9b177eb
commit 6a6806f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/app/ReadHandler.cpp b/src/app/ReadHandler.cpp
@@ -233,7 +233,7 @@ CHIP_ERROR ReadHandler::OnStatusResponse(Messaging::ExchangeContext * apExchange
  {
  appCallback->OnSubscriptionEstablished(*this);
  }
- mObserver->OnReadHandlerSubscribed(this);
+ mObserver->OnSubscriptionEstablished(this);
  }
  }
  else
@@ -882,14 +882,14 @@ void ReadHandler::SetStateFlag(ReadHandlerFlags aFlag, bool aValue)
  // If we became reportable, schedule a reporting run.
  if (!oldReportable && ShouldStartReporting())
  {
- if (IsActiveSubscription())
+ if (ShouldReportUnscheduled())
  {
- // If we became reportable, the scheduler will schedule a run as soon as allowed
- mObserver->OnBecameReportable(this);
+ InteractionModelEngine::GetInstance()->GetReportingEngine().ScheduleRun();
  }
- else if (ShouldReportUnscheduled())
+ else
  {
- InteractionModelEngine::GetInstance()->GetReportingEngine().ScheduleRun();
+ // If we became reportable, the scheduler will schedule a run as soon as allowed
+ mObserver->OnBecameReportable(this);
  }
  }
 }

diff --git a/src/app/ReadHandler.h b/src/app/ReadHandler.h
@@ -349,7 +349,7 @@ class ReadHandler : public Messaging::ExchangeDelegate
  /// without consulting the report scheduler.
  bool ShouldReportUnscheduled() const
  {
- return CanStartReporting() && (IsType(ReadHandler::InteractionType::Read) || IsPriming()) && !IsActiveSubscription();
+ return CanStartReporting() && (IsType(ReadHandler::InteractionType::Read) || IsPriming());
  }
  bool IsAwaitingReportResponse() const { return mState == HandlerState::AwaitingReportResponse; }
 

diff --git a/src/app/reporting/ReportSchedulerImpl.cpp b/src/app/reporting/ReportSchedulerImpl.cpp
@@ -57,7 +57,7 @@ void ReportSchedulerImpl::OnEnterActiveMode()
 /// @brief When a ReadHandler is added, register it in the scheduler node pool. Scheduling the report here is un-necessary since the
 /// ReadHandler will call MoveToState(HandlerState::CanStartReporting);, which will call OnBecameReportable() and schedule the
 /// report.
-void ReportSchedulerImpl::OnReadHandlerSubscribed(ReadHandler * aReadHandler)
+void ReportSchedulerImpl::OnSubscriptionEstablished(ReadHandler * aReadHandler)
 {
  ReadHandlerNode * newNode = FindReadHandlerNode(aReadHandler);
  // Handler must not be registered yet; it's just being constructed.

diff --git a/src/app/reporting/ReportSchedulerImpl.h b/src/app/reporting/ReportSchedulerImpl.h
@@ -36,7 +36,7 @@ class ReportSchedulerImpl : public ReportScheduler
  void OnEnterActiveMode() override;
 
  // ReadHandlerObserver
- void OnReadHandlerSubscribed(ReadHandler * aReadHandler) final;
+ void OnSubscriptionEstablished(ReadHandler * aReadHandler) final;
  void OnBecameReportable(ReadHandler * aReadHandler) final;
  void OnSubscriptionReportSent(ReadHandler * aReadHandler) final;
  void OnReadHandlerDestroyed(ReadHandler * aReadHandler) override;

diff --git a/src/app/tests/TestReportScheduler.cpp b/src/app/tests/TestReportScheduler.cpp
@@ -255,10 +255,10 @@ class TestReportScheduler
  {
  ReturnErrorOnFailure(readHandler->SetMaxReportingInterval(max_interval_seconds));
  ReturnErrorOnFailure(readHandler->SetMinReportingIntervalForTests(min_interval_seconds));
- scheduler->OnReadHandlerSubscribed(readHandler);
+ readHandler->ClearStateFlag(ReadHandler::ReadHandlerFlags::PrimingReports);
  readHandler->SetStateFlag(ReadHandler::ReadHandlerFlags::ActiveSubscription);
+ scheduler->OnSubscriptionEstablished(readHandler);
  readHandler->MoveToState(ReadHandler::HandlerState::CanStartReporting);
- readHandler->ClearStateFlag(ReadHandler::ReadHandlerFlags::PrimingReports);
 
  return CHIP_NO_ERROR;
  }
@@ -299,7 +299,7 @@ class TestReportScheduler
  {
  ReadHandler * readHandler =
  readHandlerPool.CreateObject(nullCallback, exchangeCtx, ReadHandler::InteractionType::Subscribe, &sScheduler);
- sScheduler.OnReadHandlerSubscribed(readHandler);
+ sScheduler.OnSubscriptionEstablished(readHandler);
  NL_TEST_ASSERT(aSuite, nullptr != readHandler);
  VerifyOrReturn(nullptr != readHandler);
  NL_TEST_ASSERT(aSuite, nullptr != sScheduler.FindReadHandlerNode(readHandler));
@@ -431,7 +431,7 @@ class TestReportScheduler
  readHandlerPool.CreateObject(nullCallback, exchangeCtx, ReadHandler::InteractionType::Subscribe, &sScheduler);
  NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == MockReadHandlerSubscriptionTransation(readHandler, &sScheduler, 1, 2));
 
- // Verifies OnReadHandlerSubscribed registered the ReadHandler in the scheduler
+ // Verifies OnSubscriptionEstablished registered the ReadHandler in the scheduler
  NL_TEST_ASSERT(aSuite, nullptr != sScheduler.FindReadHandlerNode(readHandler));
 
  // Should have registered the read handler in the scheduler and scheduled a report