Add code to update ACL after app is installed

Author: lazarkov

examples/common/m5stack-tft/repo

@@ -19,7 +19,7 @@
         <meta-data android:name="com.matter.tv.app.api.clusters" android:resource="@raw/static_matter_clusters" />
         <meta-data android:name="com.matter.tv.app.api.vendor_name" android:value="CSA" />
         <meta-data android:name="com.matter.tv.app.api.vendor_id" android:value="65521" />
-        <meta-data android:name="com.matter.tv.app.api.product_id" android:value="5678" />
+        <meta-data android:name="com.matter.tv.app.api.product_id" android:value="32769" />
         <activity
             android:name="com.example.contentapp.MainActivity"
             android:exported="true">

examples/tv-app/android/App/content-app/src/main/AndroidManifest.xml

@@ -355,6 +355,59 @@ ContentApp * ContentAppFactoryImpl::LoadContentApp(const CatalogVendorApp & vend
     return nullptr;
 }
 
+class DevicePairedCommand : public Controller::DevicePairingDelegate
+{
+public:
+    struct CallbackContext
+    {
+        uint16_t vendorId;
+        uint16_t productId;
+        chip::NodeId nodeId;
+
+        CallbackContext(uint16_t vId, uint16_t pId, chip::NodeId nId)
+            : vendorId(vId), productId(pId), nodeId(nId) {}
+    };
+    DevicePairedCommand(uint16_t vendorId, uint16_t productId, chip::NodeId nodeId) :
+        mOnDeviceConnectedCallback(OnDeviceConnectedFn, this),
+        mOnDeviceConnectionFailureCallback(OnDeviceConnectionFailureFn, this)
+    {
+        mContext = std::make_shared<CallbackContext>(vendorId, productId, nodeId);
+    }
+
+    static void OnDeviceConnectedFn(void * context, chip::Messaging::ExchangeManager & exchangeMgr,
+                                    const chip::SessionHandle & sessionHandle)
+    {
+        auto * pairingCommand = static_cast<DevicePairedCommand *>(context);
+        auto cbContext = pairingCommand->mContext;
+
+        if (pairingCommand)
+        {
+            ChipLogProgress(DeviceLayer, "OnDeviceConnectedFn - Updating ACL for node id: %llu and vendor id: %d and product id: %d", cbContext->nodeId, cbContext->vendorId, cbContext->productId);
+
+            GetCommissionerDiscoveryController()->CommissioningSucceeded(cbContext->vendorId, cbContext->productId, cbContext->nodeId, exchangeMgr, sessionHandle);
+        }
+    }
+
+
+    static void OnDeviceConnectionFailureFn(void * context, const ScopedNodeId & peerId, CHIP_ERROR error)
+    {
+        auto * pairingCommand = static_cast<DevicePairedCommand *>(context);
+        auto cbContext = pairingCommand->mContext;
+
+        if (pairingCommand)
+        {
+            ChipLogProgress(DeviceLayer, "OnDeviceConnectionFailureFn - Not updating ACL for node id: %llu and vendor id: %d and product id: %d", cbContext->nodeId, cbContext->vendorId, cbContext->productId);
+            // TODO: Remove Node Id
+        }
+    }
+
+    chip::Callback::Callback<chip::OnDeviceConnected> mOnDeviceConnectedCallback;
+    chip::Callback::Callback<chip::OnDeviceConnectionFailure> mOnDeviceConnectionFailureCallback;
+    std::shared_ptr<CallbackContext> mContext;
+};
+
+
+
 EndpointId ContentAppFactoryImpl::AddContentApp(const char * szVendorName, uint16_t vendorId, const char * szApplicationName,
                                                 uint16_t productId, const char * szApplicationVersion,
                                                 std::vector<SupportedCluster> supportedClusters, jobject manager)
@@ -369,6 +422,17 @@ EndpointId ContentAppFactoryImpl::AddContentApp(const char * szVendorName, uint1
                     app->GetEndpointId());
     mContentApps.push_back(app);
     mDataVersions.push_back(dataVersionBuf);
+
+    std::set<NodeId> nodeIds = ContentAppPlatform::GetInstance().GetNodeIdsForContentApp(vendorId, productId);
+
+    for (const auto& nodeId : nodeIds) {
+
+        ChipLogProgress(DeviceLayer, "Creating Pairing Command with node id: %llu and vendor id: %d and product id: %d", nodeId, vendorId, productId);
+
+        std::shared_ptr<DevicePairedCommand> pairingCommand = std::make_shared<DevicePairedCommand>(vendorId, productId, nodeId);
+
+        GetDeviceCommissioner()->GetConnectedDevice(nodeId, &pairingCommand->mOnDeviceConnectedCallback, &pairingCommand->mOnDeviceConnectionFailureCallback);
+    }
     return epId;
 }
 
@@ -387,6 +451,18 @@ EndpointId ContentAppFactoryImpl::AddContentApp(const char * szVendorName, uint1
                     app->GetEndpointId());
     mContentApps.push_back(app);
     mDataVersions.push_back(dataVersionBuf);
+
+    std::set<NodeId> nodeIds = ContentAppPlatform::GetInstance().GetNodeIdsForContentApp(vendorId, productId);
+
+    for (const auto& nodeId : nodeIds) {
+
+        ChipLogProgress(DeviceLayer, "Creating Pairing Command with node id: %llu and vendor id: %d and product id: %d", nodeId, vendorId, productId);
+
+        std::shared_ptr<DevicePairedCommand> pairingCommand = std::make_shared<DevicePairedCommand>(vendorId, productId, nodeId);
+
+        GetDeviceCommissioner()->GetConnectedDevice(nodeId, &pairingCommand->mOnDeviceConnectedCallback, &pairingCommand->mOnDeviceConnectionFailureCallback);
+    }
+
     return epId;
 }
 

examples/tv-app/android/java/AppImpl.cpp

@@ -258,6 +258,8 @@ class MyPostCommissioningListener : public PostCommissioningListener
         // read current binding list
         chip::Controller::ClusterBase cluster(exchangeMgr, sessionHandle, kTargetBindingClusterEndpointId);
 
+        ContentAppPlatform::GetInstance().StoreNodeIdForContentApp(vendorId, productId, nodeId);
+
         cacheContext(vendorId, productId, nodeId, exchangeMgr, sessionHandle);
 
         CHIP_ERROR err =

examples/tv-app/android/java/TVApp-JNI.cpp

@@ -387,6 +387,37 @@ ContentApp * ContentAppPlatform::GetContentApp(EndpointId id)
     return nullptr;
 }
 
+// create a string key from vendorId and productId
+std::string createKey(uint16_t vendorId, uint16_t productId) {
+    return std::to_string(vendorId) + ":" + std::to_string(productId);
+}
+
+void ContentAppPlatform::StoreNodeIdForContentApp(uint16_t vendorId, uint16_t productId, NodeId nodeId)
+{
+    std::string key = createKey(vendorId, productId);
+
+    ChipLogProgress(DeviceLayer, "Stored node id: %llu for key: %s", nodeId, key.c_str());
+
+    mConnectedContentAppNodeIds[key].insert(nodeId);
+}
+
+std::set<NodeId> ContentAppPlatform::GetNodeIdsForContentApp(uint16_t vendorId, uint16_t productId)
+{
+    std::string key = createKey(vendorId, productId);
+
+    ChipLogProgress(DeviceLayer, "Retrieving node id for key: %s", key.c_str());
+
+    auto it = mConnectedContentAppNodeIds.find(key);
+    if (it != mConnectedContentAppNodeIds.end()) {
+        ChipLogProgress(DeviceLayer, "Found node id");
+        return it->second;
+    }
+
+    ChipLogProgress(DeviceLayer, "Didn't find node id");
+    // If key not found, return an empty set
+    return {};
+}
+
 void ContentAppPlatform::SetCurrentApp(ContentApp * app)
 {
     if (!HasCurrentApp())

src/app/app-platform/ContentAppPlatform.cpp

@@ -161,6 +161,14 @@ class DLL_EXPORT ContentAppPlatform
     bool HasTargetContentApp(uint16_t vendorId, uint16_t productId, CharSpan rotatingId,
                              Protocols::UserDirectedCommissioning::TargetAppInfo & info, uint32_t & passcode);
 
+    // returns set of connected nodes for a given content app
+    std::set<NodeId> GetNodeIdsForContentApp(uint16_t vendorId, uint16_t productId);
+
+    // store node id for content app after commissioning 
+    // node id can be used later on to update ACL 
+    // in case app is not installed
+    void StoreNodeIdForContentApp(uint16_t vendorId, uint16_t productId, NodeId nodeId);
+
     /**
      * @brief
      *   Add ACLs on this device for the given client,
@@ -201,6 +209,8 @@ class DLL_EXPORT ContentAppPlatform
     EndpointId mCurrentEndpointId;
     EndpointId mFirstDynamicEndpointId;
     ContentApp * mContentApps[CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT];
+    // key is string -> vendorId:producTid
+    std::map<std::string, std::set<NodeId>> mConnectedContentAppNodeIds;
 
 private:
     void IncrementCurrentEndpointID();