Fix issue of content app losing connection to the platform-app. (#23536)

* Fix issue of content app losing connection to the platform-app. * Restyled by google-java-format * Added comments to the attribute holder class. * Restyled by google-java-format * Fix styling Co-authored-by: Restyled.io <[email protected]>
project-chip · Dec 12, 2023 · 7e5c7aa · 7e5c7aa
1 parent 5f067b4
commit 7e5c7aa
Show file tree

Hide file tree

Showing 4 changed files with 205 additions and 40 deletions.
diff --git a/.../tv-app/android/App/content-app/src/main/java/com/example/contentapp/AttributeHolder.java b/.../tv-app/android/App/content-app/src/main/java/com/example/contentapp/AttributeHolder.java
@@ -1,13 +1,100 @@
 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 AttributeHolder {
-  private static AttributeHolder instance = new AttributeHolder();
   private Map<Long, Map<Long, Object>> attributeValues = new HashMap<>();
+  private static final String TAG = "AttributeHolder";
+
+  // The following are the various values of the target list that can be set using the UI of the
+  // content app for testing.
+  // We have a short version (TL_SHORT) which is a simple target list. A long version (TL_LONG)
+  // which has several large values in the target list but always less than the single message
+  // limit(can be chunked) and a bad version (TL_LONG_BAD) which puts a value that is larger
+  // than can be handled by a single message and hence cannot be chunked.
+  // This is only for testing. These are public since they are used in the Main Activity(which
+  // renders the UI).
+  public static final String TL_LONG =
+      "[{\"0\":1, \"1\":\"Home\"},{\"0\":2, \"1\":\"Settings\"},{\"0\":3, \"1\":\"Casting Home\"}"
+          + ",{\"0\":249, \"1\":\""
+          + "1skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt\"}"
+          + ",{\"0\":250, \"1\":\""
+          + "2skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt\"}"
+          + ",{\"0\":251, \"1\":\""
+          + "3skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt\"}"
+          + ",{\"0\":252, \"1\":\""
+          + "4skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt\"}"
+          + ",{\"0\":253, \"1\":\""
+          + "5skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt\"}"
+          + ",{\"0\":254, \"1\":\""
+          + "6skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt\"}"
+          + "]";
+  public static final String TL_SHORT =
+      "[{\"0\":1, \"1\":\"Home\"},{\"0\":2, \"1\":\"Settings\"},{\"0\":3, \"1\":\"Casting Home\"}]";
+  public static final String TL_LONG_BAD =
+      "[{\"0\":1, \"1\":\"Home\"},{\"0\":2, \"1\":\"Settings\"},{\"0\":3, \"1\":\"Casting Home\"}"
+          + ",{\"0\":254, \"1\":\""
+          + "badskfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt"
+          + "skfguioufgirufgieufgifugaeifugaeifugadifugbdifugadfiugawdfiuawgdfiuawdbvawiufvafuvwiufgwieufgdhtskhtdhhtbbsagthdkgusdfjgfghdgrbt\"}"
+          + "]";
+  private static AttributeHolder instance = new AttributeHolder();
 
   private AttributeHolder() {
     // Setting up attribute defaults
@@ -21,9 +108,7 @@ private AttributeHolder() {
         3);
     setAttributeValue(Clusters.MediaPlayback.Id, Clusters.MediaPlayback.Attributes.CurrentState, 2);
     setAttributeValue(
-        Clusters.TargetNavigator.Id,
-        Clusters.TargetNavigator.Attributes.TargetList,
-        "[{\"0\":1, \"1\":\"Home\"},{\"0\":2, \"1\":\"Settings\"},{\"0\":3, \"1\":\"Casting Home\"}]");
+        Clusters.TargetNavigator.Id, Clusters.TargetNavigator.Attributes.TargetList, TL_SHORT);
     setAttributeValue(
         Clusters.TargetNavigator.Id, Clusters.TargetNavigator.Attributes.CurrentTarget, 1);
   };
@@ -33,6 +118,9 @@ public static AttributeHolder getInstance() {
   }
 
   public void setAttributeValue(long clusterId, long attributeId, Object value) {
+    if (value == null) {
+      Log.d(TAG, "Setting null for cluster " + clusterId + " attribute " + attributeId);
+    }
     Map<Long, Object> attributes = attributeValues.get(clusterId);
     if (attributes == null) {
       attributes = new HashMap<>();

diff --git a/...les/tv-app/android/App/content-app/src/main/java/com/example/contentapp/MainActivity.java b/...les/tv-app/android/App/content-app/src/main/java/com/example/contentapp/MainActivity.java
@@ -10,6 +10,9 @@
 import com.example.contentapp.matter.MatterAgentClient;
 import com.matter.tv.app.api.Clusters;
 import com.matter.tv.app.api.MatterIntentConstants;
+import com.matter.tv.app.api.SetSupportedClustersRequest;
+import com.matter.tv.app.api.SupportedCluster;
+import java.util.ArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -20,6 +23,9 @@ public class MainActivity extends AppCompatActivity {
   private static final String ATTR_PS_PAUSED = "Playback State : PAUSED";
   private static final String ATTR_PS_NOT_PLAYING = "Playback State : NOT_PLAYING";
   private static final String ATTR_PS_BUFFERING = "Playback State : BUFFERING";
+  private static final String ATTR_TL_LONG_BAD = "Target List : LONG BAD";
+  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();
 
   @Override
@@ -80,17 +86,59 @@ protected void onCreate(Bundle savedInstanceState) {
               reportAttributeChange(
                   Clusters.MediaPlayback.Id, Clusters.MediaPlayback.Attributes.CurrentState);
               break;
+            case ATTR_TL_LONG_BAD:
+              AttributeHolder.getInstance()
+                  .setAttributeValue(
+                      Clusters.TargetNavigator.Id,
+                      Clusters.TargetNavigator.Attributes.TargetList,
+                      AttributeHolder.TL_LONG_BAD);
+              reportAttributeChange(
+                  Clusters.TargetNavigator.Id, Clusters.TargetNavigator.Attributes.TargetList);
+              break;
+            case ATTR_TL_LONG:
+              AttributeHolder.getInstance()
+                  .setAttributeValue(
+                      Clusters.TargetNavigator.Id,
+                      Clusters.TargetNavigator.Attributes.TargetList,
+                      AttributeHolder.TL_LONG);
+              reportAttributeChange(
+                  Clusters.TargetNavigator.Id, Clusters.TargetNavigator.Attributes.TargetList);
+              break;
+            case ATTR_TL_SHORT:
+              AttributeHolder.getInstance()
+                  .setAttributeValue(
+                      Clusters.TargetNavigator.Id,
+                      Clusters.TargetNavigator.Attributes.TargetList,
+                      AttributeHolder.TL_SHORT);
+              reportAttributeChange(
+                  Clusters.TargetNavigator.Id, Clusters.TargetNavigator.Attributes.TargetList);
+              break;
           }
         });
     Spinner dropdown = findViewById(R.id.spinnerAttribute);
     String[] items =
-        new String[] {ATTR_PS_PLAYING, ATTR_PS_PAUSED, ATTR_PS_NOT_PLAYING, ATTR_PS_BUFFERING};
+        new String[] {
+          ATTR_PS_PLAYING,
+          ATTR_PS_PAUSED,
+          ATTR_PS_NOT_PLAYING,
+          ATTR_PS_BUFFERING,
+          ATTR_TL_LONG,
+          ATTR_TL_SHORT,
+          ATTR_TL_LONG_BAD
+        };
     ArrayAdapter<String> adapter =
         new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, items);
     dropdown.setAdapter(adapter);
 
     MatterAgentClient matterAgentClient = MatterAgentClient.getInstance();
-    executorService.execute(matterAgentClient::reportClusters);
+    if (matterAgentClient != null) {
+      SetSupportedClustersRequest supportedClustersRequest = new SetSupportedClustersRequest();
+      supportedClustersRequest.supportedClusters = new ArrayList<SupportedCluster>();
+      SupportedCluster supportedCluster = new SupportedCluster();
+      supportedCluster.clusterIdentifier = 1;
+      supportedClustersRequest.supportedClusters.add(supportedCluster);
+      executorService.execute(() -> matterAgentClient.reportClusters(supportedClustersRequest));
+    }
   }
 
   private void reportAttributeChange(final int clusterId, final int attributeId) {