Skip to content

Commit 5b2fc5c

Browse files
committed
Update per comments
1 parent 2ca78f9 commit 5b2fc5c

File tree

4 files changed

+14
-57
lines changed

4 files changed

+14
-57
lines changed

examples/tv-app/android/.idea/workspace.xml

-55
This file was deleted.

examples/tv-app/linux/README.md

+7
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,13 @@ id):
107107
$ app add 9050 (vendor id 9050)
108108
$ app remove 1
109109

110+
111+
You can also install or uninstall the app by using commands:
112+
113+
$ app install 65521 32768
114+
$ app uninstall 65521 32768
115+
116+
110117
As an app platform, local apps can be used to facilitate commissioning using
111118
their AccountLogin clusters. The dummy apps have hardcoded setup codes - on a
112119
real device, these apps would communicate with a cloud service to obtain the

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ using namespace chip::AppPlatform;
5555
using namespace chip::app::Clusters;
5656
using namespace chip::Protocols::UserDirectedCommissioning;
5757

58-
ContentAppFactoryImpl gFactory;
59-
6058
#if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
6159
class MyUserPrompter : public UserPrompter
6260
{
@@ -288,6 +286,7 @@ MyPostCommissioningListener gMyPostCommissioningListener;
288286
#endif // CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
289287

290288
#if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
289+
ContentAppFactoryImpl gFactory;
291290

292291
ContentAppFactoryImpl * GetContentAppFactoryImpl()
293292
{

src/controller/CommissionerDiscoveryController.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,12 @@ void CommissionerDiscoveryController::InternalOk()
220220
return;
221221
}
222222

223+
if (mAppInstallationService == nullptr)
224+
{
225+
ChipLogError(AppServer, "UX InternalOk: no app installation service");
226+
return;
227+
}
228+
223229
if (!mAppInstallationService->LookupTargetContentApp(client->GetVendorId(), client->GetProductId())) {
224230
ChipLogDetail(AppServer, "UX InternalOk: app not installed.");
225231

0 commit comments

Comments
 (0)