Skip to content

Commit

Permalink
Update per comments
Browse files Browse the repository at this point in the history
  • Loading branch information
lazarkov committed May 21, 2024
1 parent 2ca78f9 commit 5b2fc5c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 57 deletions.
55 changes: 0 additions & 55 deletions examples/tv-app/android/.idea/workspace.xml

This file was deleted.

7 changes: 7 additions & 0 deletions examples/tv-app/linux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ id):
$ app add 9050 (vendor id 9050)
$ app remove 1


You can also install or uninstall the app by using commands:

$ app install 65521 32768
$ app uninstall 65521 32768


As an app platform, local apps can be used to facilitate commissioning using
their AccountLogin clusters. The dummy apps have hardcoded setup codes - on a
real device, these apps would communicate with a cloud service to obtain the
Expand Down
3 changes: 1 addition & 2 deletions examples/tv-app/tv-common/src/AppTv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ using namespace chip::AppPlatform;
using namespace chip::app::Clusters;
using namespace chip::Protocols::UserDirectedCommissioning;

ContentAppFactoryImpl gFactory;

#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
class MyUserPrompter : public UserPrompter
{
Expand Down Expand Up @@ -288,6 +286,7 @@ MyPostCommissioningListener gMyPostCommissioningListener;
#endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE

#if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
ContentAppFactoryImpl gFactory;

ContentAppFactoryImpl * GetContentAppFactoryImpl()
{
Expand Down
6 changes: 6 additions & 0 deletions src/controller/CommissionerDiscoveryController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,12 @@ void CommissionerDiscoveryController::InternalOk()
return;
}

if (mAppInstallationService == nullptr)
{
ChipLogError(AppServer, "UX InternalOk: no app installation service");
return;
}

if (!mAppInstallationService->LookupTargetContentApp(client->GetVendorId(), client->GetProductId())) {
ChipLogDetail(AppServer, "UX InternalOk: app not installed.");

Expand Down

0 comments on commit 5b2fc5c

Please sign in to comment.