[OTA-R Linux] Timers were not being cancelled as intended (#18452)

* Convert mRequestor->DownloadUpdate() timer handler call to DownloadUpdateTimerHandler()

* Convert mRequestor->ApplyUpdate() timer handler call to ApplyUpdateTimerHandler()
Convert mImageProcessor->Apply() timer handler call to ApplyTimerHandler()

Author: isiu-apple

src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp

@@ -144,14 +144,37 @@ void DefaultOTARequestorDriver::HandleIdleStateEnter(IdleStateReason reason)
     }
 }
 
+void DefaultOTARequestorDriver::DownloadUpdateTimerHandler(System::Layer * systemLayer, void * appState)
+{
+    DefaultOTARequestorDriver * driver = ToDriver(appState);
+
+    VerifyOrDie(driver->mRequestor != nullptr);
+    driver->mRequestor->DownloadUpdate();
+}
+
+void DefaultOTARequestorDriver::ApplyUpdateTimerHandler(System::Layer * systemLayer, void * appState)
+{
+    DefaultOTARequestorDriver * driver = ToDriver(appState);
+
+    VerifyOrDie(driver->mRequestor != nullptr);
+    driver->mRequestor->ApplyUpdate();
+}
+
+void DefaultOTARequestorDriver::ApplyTimerHandler(System::Layer * systemLayer, void * appState)
+{
+    DefaultOTARequestorDriver * driver = ToDriver(appState);
+
+    VerifyOrDie(driver->mImageProcessor != nullptr);
+    driver->mImageProcessor->Apply();
+}
+
 void DefaultOTARequestorDriver::UpdateAvailable(const UpdateDescription & update, System::Clock::Seconds32 delay)
 {
     // IMPLEMENTATION CHOICE:
     // This implementation unconditionally downloads an available update
 
     VerifyOrDie(mRequestor != nullptr);
-    ScheduleDelayedAction(
-        delay, [](System::Layer *, void * context) { ToDriver(context)->mRequestor->DownloadUpdate(); }, this);
+    ScheduleDelayedAction(delay, DownloadUpdateTimerHandler, this);
 }
 
 CHIP_ERROR DefaultOTARequestorDriver::UpdateNotFound(UpdateNotFoundReason reason, System::Clock::Seconds32 delay)
@@ -189,8 +212,7 @@ void DefaultOTARequestorDriver::UpdateDownloaded()
 void DefaultOTARequestorDriver::UpdateConfirmed(System::Clock::Seconds32 delay)
 {
     VerifyOrDie(mImageProcessor != nullptr);
-    ScheduleDelayedAction(
-        delay, [](System::Layer *, void * context) { ToDriver(context)->mImageProcessor->Apply(); }, this);
+    ScheduleDelayedAction(delay, ApplyTimerHandler, this);
 }
 
 void DefaultOTARequestorDriver::UpdateSuspended(System::Clock::Seconds32 delay)
@@ -202,8 +224,7 @@ void DefaultOTARequestorDriver::UpdateSuspended(System::Clock::Seconds32 delay)
         delay = kDefaultDelayedActionTime;
     }
 
-    ScheduleDelayedAction(
-        delay, [](System::Layer *, void * context) { ToDriver(context)->mRequestor->ApplyUpdate(); }, this);
+    ScheduleDelayedAction(delay, ApplyUpdateTimerHandler, this);
 }
 
 void DefaultOTARequestorDriver::UpdateDiscontinued()
@@ -218,11 +239,11 @@ void DefaultOTARequestorDriver::UpdateDiscontinued()
 // Cancel all OTA update timers
 void DefaultOTARequestorDriver::UpdateCancelled()
 {
-    // Cancel all OTA Update timers started by  OTARequestorDriver regardless of whether thery are running or not
-    CancelDelayedAction([](System::Layer *, void * context) { ToDriver(context)->mRequestor->DownloadUpdate(); }, this);
+    // Cancel all OTA Update timers started by OTARequestorDriver regardless of whether thery are running or not
+    CancelDelayedAction(DownloadUpdateTimerHandler, this);
     CancelDelayedAction(StartDelayTimerHandler, this);
-    CancelDelayedAction([](System::Layer *, void * context) { ToDriver(context)->mImageProcessor->Apply(); }, this);
-    CancelDelayedAction([](System::Layer *, void * context) { ToDriver(context)->mRequestor->ApplyUpdate(); }, this);
+    CancelDelayedAction(ApplyTimerHandler, this);
+    CancelDelayedAction(ApplyUpdateTimerHandler, this);
 }
 
 void DefaultOTARequestorDriver::ScheduleDelayedAction(System::Clock::Seconds32 delay, System::TimerCompleteCallback action,

src/app/clusters/ota-requestor/DefaultOTARequestorDriver.h

@@ -84,6 +84,9 @@ class DefaultOTARequestorDriver : public OTARequestorDriver
 protected:
     static void PeriodicQueryTimerHandler(System::Layer * systemLayer, void * appState);
     static void WatchdogTimerHandler(System::Layer * systemLayer, void * appState);
+    static void DownloadUpdateTimerHandler(System::Layer * systemLayer, void * appState);
+    static void ApplyUpdateTimerHandler(System::Layer * systemLayer, void * appState);
+    static void ApplyTimerHandler(System::Layer * systemLayer, void * appState);
 
     void StartPeriodicQueryTimer();
     void StopPeriodicQueryTimer();

src/app/clusters/ota-requestor/ExtendedOTARequestorDriver.cpp

@@ -100,12 +100,7 @@ void ExtendedOTARequestorDriver::HandleUserConsentState(chip::ota::UserConsentSt
     switch (userConsentState)
     {
     case chip::ota::UserConsentState::kGranted:
-        ScheduleDelayedAction(
-            mDelayedActionTime,
-            [](System::Layer *, void * context) {
-                static_cast<ExtendedOTARequestorDriver *>(context)->mRequestor->DownloadUpdate();
-            },
-            this);
+        ScheduleDelayedAction(mDelayedActionTime, DownloadUpdateTimerHandler, this);
         break;
 
     case chip::ota::UserConsentState::kDenied: