From 14cc589af73b065e9facf9817ca0cc3539640a39 Mon Sep 17 00:00:00 2001
From: Damian Krolik <damian.krolik@nordicsemi.no>
Date: Thu, 24 Mar 2022 12:06:46 +0100
Subject: [PATCH] [nrfconnect] Fix OTA initialization order

Recent OTA changes impose an assumption that OTA Requestor
must be initialized prior to the OTA Requestor driver.
---
 examples/all-clusters-app/nrfconnect/main/AppTask.cpp    | 2 +-
 examples/lighting-app/nrfconnect/main/AppTask.cpp        | 2 +-
 examples/lock-app/nrfconnect/main/AppTask.cpp            | 2 +-
 examples/pump-app/nrfconnect/main/AppTask.cpp            | 2 +-
 examples/pump-controller-app/nrfconnect/main/AppTask.cpp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp
index e7590fd6d575b9..96da846fbcc1ad 100644
--- a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp
+++ b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp
@@ -149,9 +149,9 @@ void AppTask::InitOTARequestor()
 #if CONFIG_CHIP_OTA_REQUESTOR
     mOTAImageProcessor.SetOTADownloader(&mBDXDownloader);
     mBDXDownloader.SetImageProcessorDelegate(&mOTAImageProcessor);
-    mOTARequestorDriver.Init(&mOTARequestor, &mOTAImageProcessor);
     mOTARequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
     mOTARequestor.Init(chip::Server::GetInstance(), mOTARequestorStorage, mOTARequestorDriver, mBDXDownloader);
+    mOTARequestorDriver.Init(&mOTARequestor, &mOTAImageProcessor);
     chip::SetRequestorInstance(&mOTARequestor);
 #endif
 }
diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp
index 8aae4a4487aeb5..7161f383da9657 100644
--- a/examples/lighting-app/nrfconnect/main/AppTask.cpp
+++ b/examples/lighting-app/nrfconnect/main/AppTask.cpp
@@ -204,9 +204,9 @@ void AppTask::InitOTARequestor()
 #if CONFIG_CHIP_OTA_REQUESTOR
     sOTAImageProcessor.SetOTADownloader(&sBDXDownloader);
     sBDXDownloader.SetImageProcessorDelegate(&sOTAImageProcessor);
-    sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
     sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
     sOTARequestor.Init(Server::GetInstance(), sRequestorStorage, sOTARequestorDriver, sBDXDownloader);
+    sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
     chip::SetRequestorInstance(&sOTARequestor);
 #endif
 }
diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp
index 6ca2aa26d525e4..809c905ee377c8 100644
--- a/examples/lock-app/nrfconnect/main/AppTask.cpp
+++ b/examples/lock-app/nrfconnect/main/AppTask.cpp
@@ -185,9 +185,9 @@ void AppTask::InitOTARequestor()
 #if CONFIG_CHIP_OTA_REQUESTOR
     sOTAImageProcessor.SetOTADownloader(&sBDXDownloader);
     sBDXDownloader.SetImageProcessorDelegate(&sOTAImageProcessor);
-    sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
     sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
     sOTARequestor.Init(Server::GetInstance(), sRequestorStorage, sOTARequestorDriver, sBDXDownloader);
+    sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
     chip::SetRequestorInstance(&sOTARequestor);
 #endif
 }
diff --git a/examples/pump-app/nrfconnect/main/AppTask.cpp b/examples/pump-app/nrfconnect/main/AppTask.cpp
index 4e8b9012b14406..de9e5a7165e805 100644
--- a/examples/pump-app/nrfconnect/main/AppTask.cpp
+++ b/examples/pump-app/nrfconnect/main/AppTask.cpp
@@ -182,9 +182,9 @@ void AppTask::InitOTARequestor()
 #if CONFIG_CHIP_OTA_REQUESTOR
     sOTAImageProcessor.SetOTADownloader(&sBDXDownloader);
     sBDXDownloader.SetImageProcessorDelegate(&sOTAImageProcessor);
-    sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
     sRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
     sOTARequestor.Init(chip::Server::GetInstance(), sRequestorStorage, sOTARequestorDriver, sBDXDownloader);
+    sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
     chip::SetRequestorInstance(&sOTARequestor);
 #endif
 }
diff --git a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp
index 1c7d92c9c0dd3d..5fb7bf3d9b3d65 100644
--- a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp
+++ b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp
@@ -179,9 +179,9 @@ void AppTask::InitOTARequestor()
 #if CONFIG_CHIP_OTA_REQUESTOR
     sOTAImageProcessor.SetOTADownloader(&sBDXDownloader);
     sBDXDownloader.SetImageProcessorDelegate(&sOTAImageProcessor);
-    sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
     sRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
     sOTARequestor.Init(chip::Server::GetInstance(), sRequestorStorage, sOTARequestorDriver, sBDXDownloader);
+    sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
     chip::SetRequestorInstance(&sOTARequestor);
 #endif
 }