Update code per comments

Author: lazarkov

examples/tv-app/tv-common/include/AppTv.h

@@ -157,7 +157,7 @@ class DLL_EXPORT ContentAppFactoryImpl : public ContentAppFactory
 protected:
     std::vector<std::unique_ptr<ContentAppImpl>> mContentApps;
     std::vector<uint16_t> mAdminVendorIds{};
-    std::map<uint16_t, Protocols::UserDirectedCommissioning::CommissionerDeclaration::CdError> mAppInstallationStatus{};
+    std::map<std::string, Protocols::UserDirectedCommissioning::CommissionerDeclaration::CdError> mAppInstallationStatus{};
 };
 
 } // namespace AppPlatform

examples/tv-app/tv-common/src/AppTv.cpp

@@ -633,26 +633,34 @@ bool ContentAppFactoryImpl::UninstallContentApp(uint16_t vendorId, uint16_t prod
     return false;
 }
 
+std::string createSearchIndex(uint16_t vendorId, uint16_t productId) {
+    // Format the IDs into a string
+    std::string formattedString = std::to_string(vendorId) + ":" + std::to_string(productId);
+    return formattedString;
+}
+
 void ContentAppFactoryImpl::SetAppInstallationStatus(uint16_t vendorId, uint16_t productId, CommissionerDeclaration::CdError status)
 {
-    std::map<uint16_t, Protocols::UserDirectedCommissioning::CommissionerDeclaration::CdError>::iterator it;
-    it = mAppInstallationStatus.find(vendorId);
+    std::string searchIndex = createSearchIndex(vendorId, productId);
+    std::map<std::string, Protocols::UserDirectedCommissioning::CommissionerDeclaration::CdError>::iterator it;
+    it = mAppInstallationStatus.find(searchIndex);
     if (it != mAppInstallationStatus.end())
     {
-        mAppInstallationStatus[vendorId] = status;
+        mAppInstallationStatus[searchIndex] = status;
         return;
     }
 
-    mAppInstallationStatus.insert({ vendorId, status });
+    mAppInstallationStatus.insert({ searchIndex, status });
 }
 
 CommissionerDeclaration::CdError ContentAppFactoryImpl::GetAppInstallationStatus(uint16_t vendorId, uint16_t productId)
 {
-    std::map<uint16_t, Protocols::UserDirectedCommissioning::CommissionerDeclaration::CdError>::iterator it;
-    it = mAppInstallationStatus.find(vendorId);
+    std::string searchIndex = createSearchIndex(vendorId, productId);
+    std::map<std::string, Protocols::UserDirectedCommissioning::CommissionerDeclaration::CdError>::iterator it;
+    it = mAppInstallationStatus.find(searchIndex);
     if (it != mAppInstallationStatus.end())
     {
-        return mAppInstallationStatus[vendorId];
+        return mAppInstallationStatus[searchIndex];
     }
 
     return CommissionerDeclaration::CdError::kAppInstallConsentPending;
@@ -715,7 +723,7 @@ CHIP_ERROR AppTvInit()
     ContentAppPlatform::GetInstance().SetupAppPlatform();
     ContentAppPlatform::GetInstance().SetContentAppFactory(&gFactory);
     gFactory.InstallContentApp((uint16_t) 1, (uint16_t) 11);
-    gFactory.InstallContentApp((uint16_t) 65521, (uint16_t) 32768);
+    gFactory.InstallContentApp((uint16_t) 65521, (uint16_t) 32769);
     gFactory.InstallContentApp((uint16_t) 9050, (uint16_t) 22);
     gFactory.InstallContentApp((uint16_t) 1111, (uint16_t) 22);
     uint16_t value;

src/controller/CommissionerDiscoveryController.cpp

@@ -243,14 +243,11 @@ void CommissionerDiscoveryController::InternalOk()
         CommissionerDeclaration::CdError appInstallStatus =
             mAppInstallationService->GetInstallationStatusOfApp(client->GetVendorId(), client->GetProductId());
 
-        if (appInstallStatus != CommissionerDeclaration::CdError::kNoError)
-        {
-            // notify client the current app's installation status
-            CommissionerDeclaration cd;
-            cd.SetErrorCode(appInstallStatus);
-            mUdcServer->SendCDCMessage(cd,
-                                       Transport::PeerAddress::UDP(client->GetPeerAddress().GetIPAddress(), client->GetCdPort()));
-        }
+        // notify client the current app's installation status
+        CommissionerDeclaration cd;
+        cd.SetErrorCode(appInstallStatus);
+        mUdcServer->SendCDCMessage(cd,
+                                   Transport::PeerAddress::UDP(client->GetPeerAddress().GetIPAddress(), client->GetCdPort()));
         return;
     }
 

src/controller/CommissionerDiscoveryController.h

@@ -238,8 +238,10 @@ class DLL_EXPORT AppInstallationService
     /**
      * @brief
      *   Called to check app's installation status.
-     *
-     * This will be called by the main chip thread so any blocking work should be moved to a separate thread.
+     * 
+     * CdError status is designed for CommissionerDeclaration and should be set by using SetErrorCode() and 
+     * sent back to the client as a CDC Message. It is expected that app installation can have following statuses:
+     * kNoError, kAppInstallConsentPending, kAppInstalling, kAppInstallFailed, kAppInstalledRetryNeeded
      *
      *  @param[in]    vendorId           The vendorId in the DNS-SD advertisement of the requesting commissionee.
      *  @param[in]    productId          The productId in the DNS-SD advertisement of the requesting commissionee.