From 0613f7bde4309ea97189f9391f301dd0c68d39c1 Mon Sep 17 00:00:00 2001
From: Lazar Kovacic <lkovacic@amazon.com>
Date: Tue, 14 May 2024 21:08:39 +0200
Subject: [PATCH] Update code

---
 examples/tv-app/android/.idea/workspace.xml   | 55 +++++++++++++++++++
 .../tv-common/shell/AppTvShellCommands.cpp    |  2 +
 examples/tv-app/tv-common/src/AppTv.cpp       |  5 +-
 .../CommissionerDiscoveryController.cpp       | 41 +++++++-------
 4 files changed, 80 insertions(+), 23 deletions(-)
 create mode 100644 examples/tv-app/android/.idea/workspace.xml

diff --git a/examples/tv-app/android/.idea/workspace.xml b/examples/tv-app/android/.idea/workspace.xml
new file mode 100644
index 00000000000000..12d4da26dfc41f
--- /dev/null
+++ b/examples/tv-app/android/.idea/workspace.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="5bfde29b-91cd-4398-a808-fc1556a66aa3" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/java/AppPlatformShellCommands-JNI.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/java/AppPlatformShellCommands-JNI.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/third_party/connectedhomeip/examples/tv-app/android/java/AppPlatformShellCommands-JNI.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/third_party/connectedhomeip/examples/tv-app/android/java/AppPlatformShellCommands-JNI.cpp" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ClangdSettings">
+    <option name="formatViaClangd" value="false" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
+  &quot;associatedIndex&quot;: 1
+}</component>
+  <component name="ProjectId" id="2fKq2peYJE912eqr0bt1hZzMDBe" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;demoable-matter&quot;
+  }
+}</component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="5bfde29b-91cd-4398-a808-fc1556a66aa3" name="Changes" comment="" />
+      <created>1713559912316</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1713559912316</updated>
+    </task>
+    <servers />
+  </component>
+</project>
\ No newline at end of file
diff --git a/examples/tv-app/tv-common/shell/AppTvShellCommands.cpp b/examples/tv-app/tv-common/shell/AppTvShellCommands.cpp
index ee85cf099ff380..45957b4c25459a 100644
--- 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
index 687826e1c4ab7a..8ca3c7fbd97eb8 100644
--- 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
index a6a98af95c3fad..64ff965ed0d04b 100644
--- 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");