some code cleanup

project-chip · Feb 8, 2021 · 19cd638 · 19cd638
1 parent e44a446
commit 19cd638
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
@@ -261,7 +261,7 @@ class SetupListModel : public ListScreen::Model
         if (i == 0)
         {
             ConnectivityMgr().ClearWiFiStationProvision();
-            OpenDefaultPairingWindow(true);
+            OpenDefaultPairingWindow(kResetAdmins);
         }
     }
 

diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -211,7 +211,7 @@ class ServerCallback : public SecureSessionMgrDelegate
 
             if (err != CHIP_NO_ERROR)
             {
-                SuccessOrExit(err = OpenDefaultPairingWindow(false));
+                SuccessOrExit(err = OpenDefaultPairingWindow(kDoNotResetAdmins));
             }
             else
             {
@@ -343,7 +343,7 @@ CHIP_ERROR OpenDefaultPairingWindow(bool resetAdmins)
     params.SetSetupPINCode(pinCode);
 #endif // CONFIG_NETWORK_LAYER_BLE
 
-    if (resetAdmins)
+    if (resetAdmins == kResetAdmins)
     {
         gNextAvailableAdminId = 0;
         gAdminPairings.Reset();
@@ -409,7 +409,7 @@ void InitServer(AppDelegate * delegate)
     }
     else
     {
-        SuccessOrExit(err = OpenDefaultPairingWindow(true));
+        SuccessOrExit(err = OpenDefaultPairingWindow(kResetAdmins));
     }
 
 #if CHIP_ENABLE_MDNS

diff --git a/src/app/server/Server.h b/src/app/server/Server.h
@@ -36,6 +36,13 @@ using DemoTransportMgr = chip::TransportMgr<chip::Transport::UDP>;
  */
 void InitServer(AppDelegate * delegate = nullptr);
 
+namespace chip {
+
+constexpr bool kResetAdmins      = true;
+constexpr bool kDoNotResetAdmins = false;
+
+} // namespace chip
+
 /**
  * Open the pairing window using default configured parameters.
  */