Store the PairedDeviceList as soon as a New Device is added (#6507)

project-chip · Aug 23, 2021 · 2289749 · 2289749
1 parent 55a158c
commit 2289749
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -921,7 +921,12 @@ void DeviceCommissioner::OnSessionEstablished()
     mPairedDevices.Insert(device->GetDeviceId());
     mPairedDevicesUpdated = true;
 
+    // Note - This assumes storage is synchronous, the device must be in storage before we can cleanup
+    // the rendezvous session and mark pairing success
     PersistDevice(device);
+    // Also persist the device list at this time
+    // This makes sure that a newly added device is immediately available
+    PersistDeviceList();
 
     if (mPairingDelegate != nullptr)
     {