From 9bf6ffac7ae5dcd0283ab209be2da4ef6cedf702 Mon Sep 17 00:00:00 2001
From: amitnj <74272437+amitnj@users.noreply.github.com>
Date: Thu, 26 Jan 2023 09:03:55 -0800
Subject: [PATCH] Add support for account login cluster for content apps.
 (#24628)

* Add support for account login cluster for content apps.

* Use JniUtfString.

Co-authored-by: chrisdecenzo <61757564+chrisdecenzo@users.noreply.github.com>
---
 .../java/com/matter/tv/app/api/Clusters.java  |  31 +++
 .../contentapp/CommandResponseHolder.java     |  60 +++++
 .../com/example/contentapp/MainActivity.java  |  27 +-
 .../receiver/MatterCommandReceiver.java       |   4 +-
 .../src/main/res/layout/activity_main.xml     | 115 +++++----
 .../account-login/AccountLoginManager.cpp     |  43 +++-
 .../account-login/AccountLoginManager.h       |  21 +-
 examples/tv-app/android/java/AppImpl.cpp      |  18 +-
 examples/tv-app/android/java/AppImpl.h        |  29 ++-
 .../java/ContentAppCommandDelegate.cpp        | 233 ++++++++++++++----
 .../android/java/ContentAppCommandDelegate.h  |  17 +-
 11 files changed, 473 insertions(+), 125 deletions(-)
 create mode 100644 examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/CommandResponseHolder.java

diff --git a/examples/tv-app/android/App/common-api/src/main/java/com/matter/tv/app/api/Clusters.java b/examples/tv-app/android/App/common-api/src/main/java/com/matter/tv/app/api/Clusters.java
index 93cd816eb95984..d3fffe4e684873 100644
--- a/examples/tv-app/android/App/common-api/src/main/java/com/matter/tv/app/api/Clusters.java
+++ b/examples/tv-app/android/App/common-api/src/main/java/com/matter/tv/app/api/Clusters.java
@@ -5,7 +5,38 @@
  * the rest of the media clusters TODO : Maybe generate using ZAP tool
  */
 public class Clusters {
+
   // Clusters
+  public static class AccountLogin {
+    public static final int Id = 0x050E;
+
+    public static class Commands {
+      public static class GetSetupPIN {
+        public static final int ID = 0x00;
+
+        public static class Fields {
+          public static final int TempAccountIdentifier = 0x00;
+        }
+      }
+
+      public static class GetSetupPINResponse {
+        public static final int ID = 0x01;
+
+        public static class Fields {
+          public static final int SetupPIN = 0x00;
+        }
+      }
+
+      public static class Login {
+        public static final int ID = 0x02;
+      }
+
+      public static class Logout {
+        public static final int ID = 0x03;
+      }
+    }
+  }
+
   public static class MediaPlayback {
     public static final int Id = 0x0506;
 
diff --git a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/CommandResponseHolder.java b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/CommandResponseHolder.java
new file mode 100644
index 00000000000000..aaaeaa0cba7005
--- /dev/null
+++ b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/CommandResponseHolder.java
@@ -0,0 +1,60 @@
+package com.example.contentapp;
+
+import android.util.Log;
+import com.matter.tv.app.api.Clusters;
+import java.util.HashMap;
+import java.util.Map;
+
+/** Class to hold attribute values to help test attribute read and subscribe use cases. */
+public class CommandResponseHolder {
+  private Map<Long, Map<Long, String>> responseValues = new HashMap<>();
+  private static final String TAG = "CommandResponseHolder";
+  private static final Long DEFAULT_COMMAND = -1L;
+
+  private static CommandResponseHolder instance = new CommandResponseHolder();
+
+  private CommandResponseHolder() {
+    // Setting up responses
+    setResponseValue(
+        Clusters.ContentLauncher.Id,
+        DEFAULT_COMMAND,
+        "{\"0\":0, \"1\":\"custom response from content app for content launcher\"}");
+    setResponseValue(
+        Clusters.TargetNavigator.Id,
+        DEFAULT_COMMAND,
+        "{\"0\":0, \"1\":\"custom response from content app for target navigator\"}");
+    setResponseValue(
+        Clusters.MediaPlayback.Id,
+        DEFAULT_COMMAND,
+        "{\"0\":0, \"1\":\"custom response from content app for media playback\"}");
+    setResponseValue(
+        Clusters.AccountLogin.Id,
+        Clusters.AccountLogin.Commands.GetSetupPIN.ID,
+        "{\"0\":\"12345678\"}");
+  };
+
+  public static CommandResponseHolder getInstance() {
+    return instance;
+  }
+
+  public void setResponseValue(long clusterId, long commandId, String value) {
+    if (value == null) {
+      Log.d(TAG, "Setting null for cluster " + clusterId + " command " + commandId);
+    }
+    Map<Long, String> responses = responseValues.get(clusterId);
+    if (responses == null) {
+      responses = new HashMap<>();
+      responseValues.put(clusterId, responses);
+    }
+    responses.put(commandId, value);
+  }
+
+  public String getCommandResponse(long clusterId, long commandId) {
+    Map<Long, String> responses = responseValues.get(clusterId);
+    String response = responses.get(commandId);
+    if (response == null) {
+      response = responses.get(DEFAULT_COMMAND);
+    }
+    return response;
+  }
+}
diff --git a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/MainActivity.java b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/MainActivity.java
index 70011e726bda38..09731c67139a5f 100644
--- a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/MainActivity.java
+++ b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/MainActivity.java
@@ -4,6 +4,7 @@
 import android.os.Bundle;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
@@ -27,6 +28,7 @@ public class MainActivity extends AppCompatActivity {
   private static final String ATTR_TL_LONG = "Target List : LONG";
   private static final String ATTR_TL_SHORT = "Target List : SHORT";
   private final ExecutorService executorService = Executors.newSingleThreadExecutor();
+  private String setupPIN = "";
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -43,9 +45,30 @@ protected void onCreate(Bundle savedInstanceState) {
     TextView textView = (TextView) findViewById(R.id.commandTextView);
     textView.setText("Command Payload : " + command);
 
-    Button sendMessageButton = findViewById(R.id.sendMessageButton);
+    Button setupPINButton = findViewById(R.id.setupPINButton);
+    if (!setupPIN.isEmpty()) {
+      EditText pinText = findViewById(R.id.setupPINText);
+      pinText.setText(setupPIN);
+    }
+    setupPINButton.setOnClickListener(
+        view -> {
+          EditText pinText = findViewById(R.id.setupPINText);
+          String pinStr = pinText.getText().toString();
+          setupPIN = pinStr;
+          CommandResponseHolder.getInstance()
+              .setResponseValue(
+                  Clusters.AccountLogin.Id,
+                  Clusters.AccountLogin.Commands.GetSetupPIN.ID,
+                  "{\""
+                      + Clusters.AccountLogin.Commands.GetSetupPINResponse.Fields.SetupPIN
+                      + "\":\""
+                      + pinStr
+                      + "\"}");
+        });
+
+    Button attributeUpdateButton = findViewById(R.id.updateAttributeButton);
 
-    sendMessageButton.setOnClickListener(
+    attributeUpdateButton.setOnClickListener(
         view -> {
           Spinner dropdown = findViewById(R.id.spinnerAttribute);
           String attribute = (String) dropdown.getSelectedItem();
diff --git a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java
index 2fda386654a5c1..1ff92853ec8648 100644
--- a/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java
+++ b/examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/receiver/MatterCommandReceiver.java
@@ -6,6 +6,7 @@
 import android.content.Intent;
 import android.util.Log;
 import com.example.contentapp.AttributeHolder;
+import com.example.contentapp.CommandResponseHolder;
 import com.example.contentapp.MainActivity;
 import com.example.contentapp.matter.MatterAgentClient;
 import com.matter.tv.app.api.MatterIntentConstants;
@@ -43,7 +44,8 @@ public void onReceive(Context context, Intent intent) {
                   .append(command)
                   .toString();
           Log.d(TAG, message);
-          String response = "{\"0\":1, \"1\":\"custom response from content app\"}";
+          String response =
+              CommandResponseHolder.getInstance().getCommandResponse(clusterId, commandId);
 
           Intent in = new Intent(context, MainActivity.class);
           in.putExtra(MatterIntentConstants.EXTRA_COMMAND_PAYLOAD, command);
diff --git a/examples/tv-app/android/App/content-app/src/main/res/layout/activity_main.xml b/examples/tv-app/android/App/content-app/src/main/res/layout/activity_main.xml
index dadcd97935481a..fe8b3003c94ca0 100644
--- a/examples/tv-app/android/App/content-app/src/main/res/layout/activity_main.xml
+++ b/examples/tv-app/android/App/content-app/src/main/res/layout/activity_main.xml
@@ -1,55 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
-        android:id="@+id/helloTextView"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        android:textSize="10pt"
-        app:layout_constraintBottom_toTopOf="@+id/commandTextView"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:gravity="left"
+        android:orientation="vertical"
+        android:padding="10sp">
 
-    <TextView
-        android:id="@+id/commandTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/helloTextView"
-        android:textSize="10pt"
-        android:text="No Command!!"
-        app:layout_constraintBottom_toTopOf="@+id/sendMessageButton"
-        app:layout_constraintTop_toBottomOf="@+id/helloTextView" />
-
-    <Spinner
-        android:id="@+id/spinnerAttribute"
-        android:layout_width="239dp"
-        android:layout_height="40dp"
-        android:background="@android:drawable/btn_dropdown"
-        android:spinnerMode="dropdown"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/sendMessageButton"
-        app:layout_constraintTop_toBottomOf="@+id/commandTextView" />
-
-
-    <Button
-        android:id="@+id/sendMessageButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/helloTextView"
-        android:text="Update"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/spinnerAttribute"
-        app:layout_constraintTop_toBottomOf="@+id/commandTextView" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/group"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:constraint_referenced_ids="spinnerAttribute,sendMessageButton" />
+        <TextView
+            android:id="@+id/helloTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Hello World!"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintBottom_toTopOf="@+id/commandTextView"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/commandTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@id/helloTextView"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="No Command!!"
+            app:layout_constraintBottom_toTopOf="@+id/updateAttributeButton"
+            app:layout_constraintTop_toBottomOf="@+id/helloTextView" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="10sp">
+
+            <Spinner
+                android:layout_width="20mm"
+                android:layout_height="wrap_content"
+                android:id="@+id/spinnerAttribute"
+                android:background="@android:drawable/btn_dropdown"
+                android:spinnerMode="dropdown" />
+
+
+            <Button
+                android:id="@+id/updateAttributeButton"
+                android:layout_width="20mm"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="388dp"
+                android:layout_toEndOf="@id/helloTextView"
+                android:text="Update Attribute" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="10sp">
+
+            <EditText
+                android:inputType="number"
+                android:id="@+id/setupPINText"
+                android:layout_width="20mm"
+                android:layout_height="wrap_content"
+                android:text="20202021"
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+            <Button
+                android:id="@+id/setupPINButton"
+                android:layout_width="20mm"
+                android:layout_height="wrap_content"
+                android:text="Update PIN" />
+
+        </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/examples/tv-app/android/include/account-login/AccountLoginManager.cpp b/examples/tv-app/android/include/account-login/AccountLoginManager.cpp
index edf79a5367ed91..0f2e77e06be53f 100644
--- a/examples/tv-app/android/include/account-login/AccountLoginManager.cpp
+++ b/examples/tv-app/android/include/account-login/AccountLoginManager.cpp
@@ -19,21 +19,24 @@
 #include "AccountLoginManager.h"
 #include <app/CommandHandler.h>
 #include <app/util/af.h>
+#include <json/json.h>
+#include <lib/core/DataModelTypes.h>
 
 using namespace std;
 using namespace chip::app::Clusters::AccountLogin;
+using Status = chip::Protocols::InteractionModel::Status;
 
-AccountLoginManager::AccountLoginManager(const char * setupPin)
+AccountLoginManager::AccountLoginManager(ContentAppCommandDelegate * commandDelegate, const char * setupPin) :
+    mCommandDelegate(commandDelegate)
 {
     CopyString(mSetupPin, sizeof(mSetupPin), setupPin);
 }
 
 bool AccountLoginManager::HandleLogin(const CharSpan & tempAccountIdentifier, const CharSpan & setupPin)
 {
+    ChipLogProgress(DeviceLayer, "AccountLoginManager::HandleLogin called for endpoint %d", mEndpointId);
     string tempAccountIdentifierString(tempAccountIdentifier.data(), tempAccountIdentifier.size());
     string setupPinString(setupPin.data(), setupPin.size());
-    ChipLogProgress(Zcl, "temporary account id: %s", tempAccountIdentifierString.c_str());
-    ChipLogProgress(Zcl, "setup pin %s", setupPinString.c_str());
 
     if (strcmp(mSetupPin, setupPinString.c_str()) == 0)
     {
@@ -64,3 +67,37 @@ void AccountLoginManager::HandleGetSetupPin(CommandResponseHelper<GetSetupPINRes
     response.setupPIN = CharSpan::fromCharString(mSetupPin);
     helper.Success(response);
 }
+
+void AccountLoginManager::GetSetupPin(char * setupPin, size_t setupPinSize, const CharSpan & tempAccountIdentifier)
+{
+    // Only this method is called outside of the normal Matter communication with endpoints and clusters.
+    // Hence we have to introduce call to the java layer(thorough the command delegate) here.
+    // Other methods in this class do not need to be changed beecause those will get routed to java layer
+    // upstream.
+    ChipLogProgress(DeviceLayer, "AccountLoginManager::GetSetupPin called for endpoint %d", mEndpointId);
+    string tempAccountIdentifierString(tempAccountIdentifier.data(), tempAccountIdentifier.size());
+    if (mCommandDelegate == nullptr)
+    {
+        // For the dummy content apps to work.
+        CopyString(setupPin, setupPinSize, mSetupPin);
+        ChipLogProgress(Zcl, "Returning pin for dummy content app");
+        return;
+    }
+
+    Json::Value response;
+    bool commandHandled = true;
+    mCommandDelegate->InvokeCommand(mEndpointId, chip::app::Clusters::AccountLogin::Id,
+                                    chip::app::Clusters::AccountLogin::Commands::GetSetupPIN::Id,
+                                    "{\"0\": \"" + tempAccountIdentifierString + "\"}", commandHandled, response);
+    Status status;
+    GetSetupPINResponse pinResponse = mCommandDelegate->FormatGetSetupPINResponse(response, status);
+    if (status == chip::Protocols::InteractionModel::Status::Success)
+    {
+        CopyString(setupPin, setupPinSize, pinResponse.setupPIN);
+    }
+    else
+    {
+        CopyString(setupPin, setupPinSize, "");
+    }
+    ChipLogProgress(Zcl, "Returning pin for content app for endpoint %d", mEndpointId);
+};
diff --git a/examples/tv-app/android/include/account-login/AccountLoginManager.h b/examples/tv-app/android/include/account-login/AccountLoginManager.h
index 86326f9440a610..aa229d8bb9d88b 100644
--- a/examples/tv-app/android/include/account-login/AccountLoginManager.h
+++ b/examples/tv-app/android/include/account-login/AccountLoginManager.h
@@ -18,21 +18,24 @@
 
 #pragma once
 
+#include "../../java/ContentAppCommandDelegate.h"
 #include <app/clusters/account-login-server/account-login-server.h>
 
 #include <app/util/af-types.h>
 
 using chip::CharSpan;
+using chip::EndpointId;
 using chip::app::CommandResponseHelper;
 using chip::Platform::CopyString;
-using AccountLoginDelegate = chip::app::Clusters::AccountLogin::Delegate;
-using GetSetupPINResponse  = chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::Type;
+using AccountLoginDelegate      = chip::app::Clusters::AccountLogin::Delegate;
+using GetSetupPINResponse       = chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::Type;
+using ContentAppCommandDelegate = chip::AppPlatform::ContentAppCommandDelegate;
 
 class AccountLoginManager : public AccountLoginDelegate
 {
 public:
-    AccountLoginManager() : AccountLoginManager("tempPin123"){};
-    AccountLoginManager(const char * setupPin);
+    AccountLoginManager(ContentAppCommandDelegate * commandDelegate) : AccountLoginManager(commandDelegate, "tempPin123"){};
+    AccountLoginManager(ContentAppCommandDelegate * commandDelegate, const char * setupPin);
 
     inline void SetSetupPin(char * setupPin) override { CopyString(mSetupPin, sizeof(mSetupPin), setupPin); };
 
@@ -40,12 +43,14 @@ class AccountLoginManager : public AccountLoginDelegate
     bool HandleLogout() override;
     void HandleGetSetupPin(CommandResponseHelper<GetSetupPINResponse> & helper,
                            const CharSpan & tempAccountIdentifierString) override;
-    inline void GetSetupPin(char * setupPin, size_t setupPinSize, const CharSpan & tempAccountIdentifierString) override
-    {
-        CopyString(setupPin, setupPinSize, mSetupPin);
-    };
+    void GetSetupPin(char * setupPin, size_t setupPinSize, const CharSpan & tempAccountIdentifierString) override;
+    void SetEndpointId(EndpointId epId) { mEndpointId = epId; };
 
 protected:
     static const size_t kSetupPinSize = 12;
     char mSetupPin[kSetupPinSize];
+
+private:
+    ContentAppCommandDelegate * mCommandDelegate;
+    EndpointId mEndpointId;
 };
diff --git a/examples/tv-app/android/java/AppImpl.cpp b/examples/tv-app/android/java/AppImpl.cpp
index 43eec9e4516fd2..d2e392533ad9f4 100644
--- a/examples/tv-app/android/java/AppImpl.cpp
+++ b/examples/tv-app/android/java/AppImpl.cpp
@@ -268,6 +268,11 @@ void ContentAppFactoryImpl::setContentAppAttributeDelegate(ContentAppAttributeDe
     mAttributeDelegate = attributeDelegate;
 }
 
+void ContentAppFactoryImpl::setContentAppCommandDelegate(ContentAppCommandDelegate * commandDelegate)
+{
+    mCommandDelegate = commandDelegate;
+}
+
 CHIP_ERROR ContentAppFactoryImpl::LookupCatalogVendorApp(uint16_t vendorId, uint16_t productId, CatalogVendorApp * destinationApp)
 {
     std::string appId               = BuildAppId(vendorId);
@@ -331,9 +336,9 @@ EndpointId ContentAppFactoryImpl::AddContentApp(const char * szVendorName, uint1
                                                 uint16_t productId, const char * szApplicationVersion, jobject manager)
 {
     DataVersion * dataVersionBuf = new DataVersion[ArraySize(contentAppClusters)];
-    ContentAppImpl * app         = new ContentAppImpl(szVendorName, vendorId, szApplicationName, productId, szApplicationVersion,
-                                              "20202021", mAttributeDelegate);
-    EndpointId epId              = ContentAppPlatform::GetInstance().AddContentApp(
+    ContentAppImpl * app = new ContentAppImpl(szVendorName, vendorId, szApplicationName, productId, szApplicationVersion, "",
+                                              mAttributeDelegate, mCommandDelegate);
+    EndpointId epId      = ContentAppPlatform::GetInstance().AddContentApp(
         app, &contentAppEndpoint, Span<DataVersion>(dataVersionBuf, ArraySize(contentAppClusters)),
         Span<const EmberAfDeviceType>(gContentAppDeviceType));
     ChipLogProgress(DeviceLayer, "ContentAppFactoryImpl AddContentApp endpoint returned %d. Endpoint set %d", epId,
@@ -348,9 +353,9 @@ EndpointId ContentAppFactoryImpl::AddContentApp(const char * szVendorName, uint1
                                                 EndpointId desiredEndpointId)
 {
     DataVersion * dataVersionBuf = new DataVersion[ArraySize(contentAppClusters)];
-    ContentAppImpl * app         = new ContentAppImpl(szVendorName, vendorId, szApplicationName, productId, szApplicationVersion,
-                                              "20202021", mAttributeDelegate);
-    EndpointId epId              = ContentAppPlatform::GetInstance().AddContentApp(
+    ContentAppImpl * app = new ContentAppImpl(szVendorName, vendorId, szApplicationName, productId, szApplicationVersion, "",
+                                              mAttributeDelegate, mCommandDelegate);
+    EndpointId epId      = ContentAppPlatform::GetInstance().AddContentApp(
         app, &contentAppEndpoint, Span<DataVersion>(dataVersionBuf, ArraySize(contentAppClusters)),
         Span<const EmberAfDeviceType>(gContentAppDeviceType), desiredEndpointId);
     ChipLogProgress(DeviceLayer, "ContentAppFactoryImpl AddContentApp endpoint returned %d. Endpoint set %d", epId,
@@ -442,6 +447,7 @@ CHIP_ERROR InitVideoPlayerPlatform(jobject contentAppEndpointManager)
     ContentAppPlatform::GetInstance().SetupAppPlatform();
     ContentAppPlatform::GetInstance().SetContentAppFactory(&gFactory);
     gFactory.setContentAppAttributeDelegate(new ContentAppAttributeDelegate(contentAppEndpointManager));
+    gFactory.setContentAppCommandDelegate(new ContentAppCommandDelegate(contentAppEndpointManager));
 
     ChipLogProgress(AppServer, "Starting registration of command handler delegates");
     for (size_t i = 0; i < ArraySize(contentAppClusters); i++)
diff --git a/examples/tv-app/android/java/AppImpl.h b/examples/tv-app/android/java/AppImpl.h
index fb11ee33529f70..0b2e95da0c21c2 100644
--- a/examples/tv-app/android/java/AppImpl.h
+++ b/examples/tv-app/android/java/AppImpl.h
@@ -42,6 +42,7 @@
 #include "ChannelManager.h"
 #include "CommissionerMain.h"
 #include "ContentAppAttributeDelegate.h"
+#include "ContentAppCommandDelegate.h"
 #include "KeypadInputManager.h"
 #include <app/clusters/account-login-server/account-login-delegate.h>
 #include <app/clusters/application-basic-server/application-basic-delegate.h>
@@ -77,6 +78,7 @@ using MediaPlaybackDelegate       = app::Clusters::MediaPlayback::Delegate;
 using TargetNavigatorDelegate     = app::Clusters::TargetNavigator::Delegate;
 using SupportedStreamingProtocol  = app::Clusters::ContentLauncher::SupportedStreamingProtocol;
 using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelegate;
+using ContentAppCommandDelegate   = chip::AppPlatform::ContentAppCommandDelegate;
 
 static const int kCatalogVendorId = CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID;
 
@@ -87,17 +89,23 @@ class DLL_EXPORT ContentAppImpl : public ContentApp
 {
 public:
     ContentAppImpl(const char * szVendorName, uint16_t vendorId, const char * szApplicationName, uint16_t productId,
-                   const char * szApplicationVersion, const char * setupPIN, ContentAppAttributeDelegate * attributeDelegate) :
+                   const char * szApplicationVersion, const char * setupPIN, ContentAppAttributeDelegate * attributeDelegate,
+                   ContentAppCommandDelegate * commandDelegate) :
         mApplicationBasicDelegate(kCatalogVendorId, BuildAppId(vendorId), szVendorName, vendorId, szApplicationName, productId,
                                   szApplicationVersion),
-        mAccountLoginDelegate(setupPIN), mContentLauncherDelegate(attributeDelegate, { "image/*", "video/*" },
-                                                                  to_underlying(SupportedStreamingProtocol::kDash) |
-                                                                      to_underlying(SupportedStreamingProtocol::kHls)),
+        mAccountLoginDelegate(commandDelegate, setupPIN),
+        mContentLauncherDelegate(attributeDelegate, { "image/*", "video/*" },
+                                 to_underlying(SupportedStreamingProtocol::kDash) |
+                                     to_underlying(SupportedStreamingProtocol::kHls)),
         mMediaPlaybackDelegate(attributeDelegate),
         mTargetNavigatorDelegate(attributeDelegate, { "home", "search", "info", "guide", "menu" }, 0){};
     virtual ~ContentAppImpl() {}
 
-    AccountLoginDelegate * GetAccountLoginDelegate() override { return &mAccountLoginDelegate; };
+    AccountLoginDelegate * GetAccountLoginDelegate() override
+    {
+        mAccountLoginDelegate.SetEndpointId(GetEndpointId());
+        return &mAccountLoginDelegate;
+    };
     ApplicationBasicDelegate * GetApplicationBasicDelegate() override { return &mApplicationBasicDelegate; };
     ApplicationLauncherDelegate * GetApplicationLauncherDelegate() override { return &mApplicationLauncherDelegate; };
     ChannelDelegate * GetChannelDelegate() override { return &mChannelDelegate; };
@@ -174,12 +182,14 @@ class DLL_EXPORT ContentAppFactoryImpl : public ContentAppFactory
 
     void setContentAppAttributeDelegate(ContentAppAttributeDelegate * attributeDelegate);
 
+    void setContentAppCommandDelegate(ContentAppCommandDelegate * commandDelegate);
+
 protected:
     std::vector<ContentAppImpl *> mContentApps{
-        new ContentAppImpl("Vendor1", 1, "exampleid", 11, "Version1", "20202021", nullptr),
-        new ContentAppImpl("Vendor2", 65521, "exampleString", 32768, "Version2", "20202021", nullptr),
-        new ContentAppImpl("Vendor3", 9050, "App3", 22, "Version3", "20202021", nullptr),
-        new ContentAppImpl("TestSuiteVendor", 1111, "applicationId", 22, "v2", "20202021", nullptr)
+        new ContentAppImpl("Vendor1", 1, "exampleid", 11, "Version1", "20202021", nullptr, nullptr),
+        new ContentAppImpl("Vendor2", 65521, "exampleString", 32768, "Version2", "20202021", nullptr, nullptr),
+        new ContentAppImpl("Vendor3", 9050, "App3", 22, "Version3", "20202021", nullptr, nullptr),
+        new ContentAppImpl("TestSuiteVendor", 1111, "applicationId", 22, "v2", "20202021", nullptr, nullptr)
     };
     std::vector<DataVersion *> mDataVersions{};
 
@@ -187,6 +197,7 @@ class DLL_EXPORT ContentAppFactoryImpl : public ContentAppFactory
 
 private:
     ContentAppAttributeDelegate * mAttributeDelegate;
+    ContentAppCommandDelegate * mCommandDelegate;
 };
 
 } // namespace AppPlatform
diff --git a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
index 7773548335db5f..05763b6e09883e 100644
--- a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
+++ b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
@@ -25,6 +25,7 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/CommandHandlerInterface.h>
 #include <jni.h>
+#include <lib/core/DataModelTypes.h>
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
@@ -38,6 +39,8 @@ using CommandHandlerInterface    = chip::app::CommandHandlerInterface;
 using LaunchResponseType         = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Type;
 using PlaybackResponseType       = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Type;
 using NavigateTargetResponseType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type;
+using GetSetupPINResponseType    = chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::Type;
+using Status                     = Protocols::InteractionModel::Status;
 
 const std::string FAILURE_KEY        = "PlatformError";
 const std::string FAILURE_STATUS_KEY = "Status";
@@ -79,10 +82,9 @@ void ContentAppCommandDelegate::InvokeCommand(CommandHandlerInterface::HandlerCo
             FormatResponseData(handlerContext, "{\"value\":{}}");
             return;
         }
-        const char * respStr = env->GetStringUTFChars(resp, 0);
-        ChipLogProgress(Zcl, "ContentAppCommandDelegate::InvokeCommand got response %s", respStr);
-        FormatResponseData(handlerContext, respStr);
-        env->ReleaseStringUTFChars(resp, respStr);
+        JniUtfString respStr(env, resp);
+        ChipLogProgress(Zcl, "ContentAppCommandDelegate::InvokeCommand got response %s", respStr.c_str());
+        FormatResponseData(handlerContext, respStr.c_str());
         env->DeleteLocalRef(resp);
     }
     else
@@ -91,6 +93,59 @@ void ContentAppCommandDelegate::InvokeCommand(CommandHandlerInterface::HandlerCo
     }
 }
 
+Status ContentAppCommandDelegate::InvokeCommand(EndpointId epId, ClusterId clusterId, CommandId commandId, std::string payload,
+                                                bool & commandHandled, Json::Value & value)
+{
+    if (epId >= FIXED_ENDPOINT_COUNT)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        UtfString jsonString(env, payload.c_str());
+
+        ChipLogProgress(Zcl, "ContentAppCommandDelegate::InvokeCommand send command being called with payload %s", payload.c_str());
+
+        jstring resp =
+            (jstring) env->CallObjectMethod(mContentAppEndpointManager, mSendCommandMethod, static_cast<jint>(epId),
+                                            static_cast<jint>(clusterId), static_cast<jint>(commandId), jsonString.jniValue());
+        if (env->ExceptionCheck())
+        {
+            ChipLogError(Zcl, "Java exception in ContentAppCommandDelegate::sendCommand");
+            env->ExceptionDescribe();
+            env->ExceptionClear();
+        }
+        else
+        {
+            JniUtfString respStr(env, resp);
+            ChipLogProgress(Zcl, "ContentAppCommandDelegate::InvokeCommand got response %s", respStr.c_str());
+
+            Json::Reader reader;
+            if (!reader.parse(respStr.c_str(), value))
+            {
+                env->DeleteLocalRef(resp);
+                return Protocols::InteractionModel::Status::Failure;
+            }
+        }
+        env->DeleteLocalRef(resp);
+
+        // handle errors from platform-app
+        if (!value[FAILURE_KEY].empty())
+        {
+            value = value[FAILURE_KEY];
+            if (!value[FAILURE_STATUS_KEY].empty() && value[FAILURE_STATUS_KEY].isUInt())
+            {
+                return static_cast<Protocols::InteractionModel::Status>(value[FAILURE_STATUS_KEY].asUInt());
+            }
+            return Protocols::InteractionModel::Status::Failure;
+        }
+
+        return Protocols::InteractionModel::Status::UnsupportedEndpoint;
+    }
+    else
+    {
+        commandHandled = false;
+        return Protocols::InteractionModel::Status::UnsupportedEndpoint;
+    }
+}
+
 void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::HandlerContext & handlerContext, const char * response)
 {
     handlerContext.SetCommandHandled();
@@ -118,83 +173,159 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand
     switch (handlerContext.mRequestPath.mClusterId)
     {
     case app::Clusters::ContentLauncher::Id: {
-        LaunchResponseType launchResponse;
-        std::string statusFieldId =
-            std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LauncherResponse::Fields::kStatus));
-        if (value[statusFieldId].empty())
+        Status status;
+        LaunchResponseType launchResponse = FormatContentLauncherResponse(value, status);
+        if (status != Protocols::InteractionModel::Status::Success)
         {
-            handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure);
-            return;
+            handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, status);
         }
         else
         {
-            launchResponse.status =
-                static_cast<app::Clusters::ContentLauncher::ContentLaunchStatusEnum>(value[statusFieldId].asInt());
-            std::string dataFieldId =
-                std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LauncherResponse::Fields::kData));
-            if (!value[dataFieldId].empty())
-            {
-                launchResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString()));
-            }
+            handlerContext.mCommandHandler.AddResponseData(handlerContext.mRequestPath, launchResponse);
         }
-        handlerContext.mCommandHandler.AddResponseData(handlerContext.mRequestPath, launchResponse);
         break;
     }
 
     case app::Clusters::TargetNavigator::Id: {
-        NavigateTargetResponseType navigateTargetResponse;
-        std::string statusFieldId =
-            std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kStatus));
-        if (value[statusFieldId].empty())
+        Status status;
+        NavigateTargetResponseType navigateTargetResponse = FormatNavigateTargetResponse(value, status);
+        if (status != Protocols::InteractionModel::Status::Success)
         {
-            handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure);
-            return;
+            handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, status);
         }
         else
         {
-            navigateTargetResponse.status =
-                static_cast<app::Clusters::TargetNavigator::TargetNavigatorStatusEnum>(value[statusFieldId].asInt());
-            std::string dataFieldId =
-                std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kData));
-            if (!value[dataFieldId].empty())
-            {
-                navigateTargetResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString()));
-            }
+            handlerContext.mCommandHandler.AddResponseData(handlerContext.mRequestPath, navigateTargetResponse);
         }
-        handlerContext.mCommandHandler.AddResponseData(handlerContext.mRequestPath, navigateTargetResponse);
         break;
     }
 
     case app::Clusters::MediaPlayback::Id: {
-        PlaybackResponseType playbackResponse;
-        std::string statusFieldId =
-            std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kStatus));
-        if (value[statusFieldId].empty())
+        Status status;
+        PlaybackResponseType playbackResponse = FormatMediaPlaybackResponse(value, status);
+        if (status != Protocols::InteractionModel::Status::Success)
         {
-            handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure);
-            return;
+            handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, status);
         }
         else
         {
-            playbackResponse.status =
-                static_cast<app::Clusters::MediaPlayback::MediaPlaybackStatusEnum>(value[statusFieldId].asInt());
-            std::string dataFieldId =
-                std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kData));
-            if (!value[dataFieldId].empty())
-            {
-                playbackResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString()));
-            }
+            handlerContext.mCommandHandler.AddResponseData(handlerContext.mRequestPath, playbackResponse);
         }
-        handlerContext.mCommandHandler.AddResponseData(handlerContext.mRequestPath, playbackResponse);
         break;
     }
 
-    // case app::Clusters::AccountLogin::Id:
-    //     break;
+    case app::Clusters::AccountLogin::Id: {
+        if (app::Clusters::AccountLogin::Commands::GetSetupPIN::Id != handlerContext.mRequestPath.mCommandId)
+        {
+            // No response for other commands in this cluster
+            break;
+        }
+        Status status;
+        GetSetupPINResponseType getSetupPINresponse = FormatGetSetupPINResponse(value, status);
+        if (status != Protocols::InteractionModel::Status::Success)
+        {
+            handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, status);
+        }
+        else
+        {
+            handlerContext.mCommandHandler.AddResponseData(handlerContext.mRequestPath, getSetupPINresponse);
+        }
+        break;
+    }
     default:
         handlerContext.SetCommandNotHandled();
     }
 }
 
+LaunchResponseType ContentAppCommandDelegate::FormatContentLauncherResponse(Json::Value value, Status & status)
+{
+    status = Protocols::InteractionModel::Status::Success;
+    LaunchResponseType launchResponse;
+    std::string statusFieldId =
+        std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LauncherResponse::Fields::kStatus));
+    if (value[statusFieldId].empty())
+    {
+        status = Protocols::InteractionModel::Status::Failure;
+        return launchResponse;
+    }
+    else
+    {
+        launchResponse.status = static_cast<app::Clusters::ContentLauncher::ContentLaunchStatusEnum>(value[statusFieldId].asInt());
+        std::string dataFieldId =
+            std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LauncherResponse::Fields::kData));
+        if (!value[dataFieldId].empty())
+        {
+            launchResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString()));
+        }
+    }
+    return launchResponse;
+}
+
+NavigateTargetResponseType ContentAppCommandDelegate::FormatNavigateTargetResponse(Json::Value value, Status & status)
+{
+    status = Protocols::InteractionModel::Status::Success;
+    NavigateTargetResponseType navigateTargetResponse;
+    std::string statusFieldId =
+        std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kStatus));
+    if (value[statusFieldId].empty())
+    {
+        status = Protocols::InteractionModel::Status::Failure;
+        return navigateTargetResponse;
+    }
+    else
+    {
+        navigateTargetResponse.status =
+            static_cast<app::Clusters::TargetNavigator::TargetNavigatorStatusEnum>(value[statusFieldId].asInt());
+        std::string dataFieldId =
+            std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kData));
+        if (!value[dataFieldId].empty())
+        {
+            navigateTargetResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString()));
+        }
+    }
+    return navigateTargetResponse;
+}
+
+PlaybackResponseType ContentAppCommandDelegate::FormatMediaPlaybackResponse(Json::Value value, Status & status)
+{
+    status = Protocols::InteractionModel::Status::Success;
+    PlaybackResponseType playbackResponse;
+    std::string statusFieldId =
+        std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kStatus));
+    if (value[statusFieldId].empty())
+    {
+        status = Protocols::InteractionModel::Status::Failure;
+        return playbackResponse;
+    }
+    else
+    {
+        playbackResponse.status = static_cast<app::Clusters::MediaPlayback::MediaPlaybackStatusEnum>(value[statusFieldId].asInt());
+        std::string dataFieldId =
+            std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kData));
+        if (!value[dataFieldId].empty())
+        {
+            playbackResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString()));
+        }
+    }
+    return playbackResponse;
+}
+
+GetSetupPINResponseType ContentAppCommandDelegate::FormatGetSetupPINResponse(Json::Value value, Status & status)
+{
+    status = Protocols::InteractionModel::Status::Success;
+    GetSetupPINResponseType getSetupPINresponse;
+    std::string setupPINFieldId =
+        std::to_string(to_underlying(app::Clusters::AccountLogin::Commands::GetSetupPINResponse::Fields::kSetupPIN));
+    if (!value[setupPINFieldId].empty())
+    {
+        getSetupPINresponse.setupPIN = CharSpan::fromCharString(value[setupPINFieldId].asCString());
+    }
+    else
+    {
+        getSetupPINresponse.setupPIN = "";
+    }
+    return getSetupPINresponse;
+}
+
 } // namespace AppPlatform
 } // namespace chip
diff --git a/examples/tv-app/android/java/ContentAppCommandDelegate.h b/examples/tv-app/android/java/ContentAppCommandDelegate.h
index 23a7f8e1b82180..610a2c7069f29d 100644
--- a/examples/tv-app/android/java/ContentAppCommandDelegate.h
+++ b/examples/tv-app/android/java/ContentAppCommandDelegate.h
@@ -22,16 +22,23 @@
 
 #pragma once
 
+#include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandlerInterface.h>
 #include <jni.h>
+#include <json/json.h>
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/JniReferences.h>
 
 namespace chip {
 namespace AppPlatform {
 
-using CommandHandlerInterface = chip::app::CommandHandlerInterface;
+using CommandHandlerInterface    = chip::app::CommandHandlerInterface;
+using Status                     = Protocols::InteractionModel::Status;
+using LaunchResponseType         = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Type;
+using PlaybackResponseType       = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Type;
+using NavigateTargetResponseType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type;
+using GetSetupPINResponseType    = chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::Type;
 
 class ContentAppCommandDelegate : public CommandHandlerInterface
 {
@@ -66,6 +73,14 @@ class ContentAppCommandDelegate : public CommandHandlerInterface
 
     void InvokeCommand(CommandHandlerInterface::HandlerContext & handlerContext) override;
 
+    Status InvokeCommand(EndpointId epId, ClusterId clusterId, CommandId commandId, std::string payload, bool & commandHandled,
+                         Json::Value & value);
+
+    GetSetupPINResponseType FormatGetSetupPINResponse(Json::Value value, Status & status);
+    LaunchResponseType FormatContentLauncherResponse(Json::Value value, Status & status);
+    NavigateTargetResponseType FormatNavigateTargetResponse(Json::Value value, Status & status);
+    PlaybackResponseType FormatMediaPlaybackResponse(Json::Value value, Status & status);
+
 private:
     void InitializeJNIObjects(jobject manager)
     {