Update code

lazarkov · May 14, 2024 · 0613f7b · 0613f7b
1 parent 5407248
commit 0613f7b
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 23 deletions.
diff --git a/examples/tv-app/android/.idea/workspace.xml b/examples/tv-app/android/.idea/workspace.xml
diff --git a/examples/tv-app/tv-common/shell/AppTvShellCommands.cpp b/examples/tv-app/tv-common/shell/AppTvShellCommands.cpp
@@ -257,6 +257,8 @@ static CHIP_ERROR AppPlatformHandler(int argc, char ** argv)
         {
             pid = (uint16_t) strtol(argv[2], &eptr, 10);
         }
+        ContentAppFactoryImpl * factory = GetContentAppFactoryImpl();
+        factory->AddContentApp(vid, pid);
         ContentAppPlatform::GetInstance().LoadContentAppByClient(vid, pid);
 
         ChipLogProgress(DeviceLayer, "added app");

diff --git a/examples/tv-app/tv-common/src/AppTv.cpp b/examples/tv-app/tv-common/src/AppTv.cpp
@@ -103,10 +103,7 @@ class MyUserPrompter : public UserPrompter
 
     // tv should override this with a dialog prompt
     inline void PromptForAppInstallOKPermission(uint16_t vendorId, uint16_t productId, const char * commissioneeName) override
-    {
-        gFactory.AddContentApp(vendorId, productId);
-        return;
-    }
+    { return; }
 };
 
 MyUserPrompter gMyUserPrompter;

diff --git a/src/controller/CommissionerDiscoveryController.cpp b/src/controller/CommissionerDiscoveryController.cpp
@@ -219,6 +219,28 @@ void CommissionerDiscoveryController::InternalOk()
         ChipLogError(AppServer, "UX InternalOk: could not find instance=%s", mCurrentInstance);
         return;
     }
+
+    bool isContentAppInstalled = mAppInstallationService->HasContentApp(client->GetVendorId(), client->GetProductId());
+
+    if (!isContentAppInstalled) {
+        ChipLogDetail(AppServer, "UX InternalOk: app not installed.");
+
+        // TODO: send CDC message that user is prompted to install the app
+
+        // dialog
+        ChipLogDetail(Controller,
+                        "------PROMPT USER: %s is requesting to install app on this TV. [" ChipLogFormatMEI "," ChipLogFormatMEI "]",
+                        client->GetDeviceName(), ChipLogValueMEI(client->GetVendorId()), ChipLogValueMEI(client->GetProductId()));
+
+        if (mUserPrompter != nullptr)
+        {
+            mUserPrompter->PromptForAppInstallOKPermission(client->GetVendorId(), client->GetProductId(), client->GetDeviceName());
+        }
+        ChipLogDetail(Controller, "------Via Shell Enter: app add <pid> <vid>");
+        // TODO: force user to send again "cast request <id>" command?
+        return;
+    }
+
     if (client->GetUDCClientProcessingState() != UDCClientProcessingState::kPromptingUser)
     {
         ChipLogError(AppServer, "UX InternalOk: invalid state for ok");
@@ -245,25 +267,6 @@ void CommissionerDiscoveryController::InternalOk()
 
     uint8_t targetAppCount = client->GetNumTargetAppInfos();
 
-    bool isContentAppInstalled = mAppInstallationService->HasContentApp(client->GetVendorId(), client->GetProductId());
-
-    if (!isContentAppInstalled) {
-        ChipLogDetail(AppServer, "UX InternalOk: app not installed.");
-
-        // dialog
-        ChipLogDetail(Controller,
-                        "------PROMPT USER: %s is requesting to install app on this TV, accept? [" ChipLogFormatMEI "," ChipLogFormatMEI "]",
-                        client->GetDeviceName(), ChipLogValueMEI(client->GetVendorId()), ChipLogValueMEI(client->GetProductId()));
-
-        if (mUserPrompter != nullptr)
-        {
-            mUserPrompter->PromptForAppInstallOKPermission(client->GetVendorId(), client->GetProductId(), client->GetDeviceName());
-        }
-        ChipLogDetail(Controller, "------Via Shell Enter: controller ux accept|cancel");
-        client->SetUDCClientProcessingState(UDCClientProcessingState::kPromptingUser);
-        return;
-    }
-
     if (targetAppCount > 0)
     {
         ChipLogDetail(AppServer, "UX InternalOk: checking for each target app specified");