Fixed bugs, UNSUPPORTED_ENDPOINT appearing

sharadb-amazon · Feb 9, 2024 · f904561 · f904561
1 parent c79f5ca
commit f904561
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/...sting-app/android/App/app/src/main/java/com/matter/casting/ConnectionExampleFragment.java b/...sting-app/android/App/app/src/main/java/com/matter/casting/ConnectionExampleFragment.java
@@ -129,19 +129,25 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
                                   Log.d(TAG, "CompletableFuture.thenRun() endpoints: " + endpoints);
                                   for(Endpoint endpoint: endpoints)
                                   {
-                                      MatterClusters.ContentLauncherCluster cluster = endpoint.getCluster(MatterClusters.ContentLauncherCluster.class);
-                                      Log.d(TAG, "CompletableFuture.thenRun() endpoint.cluster: " + cluster);
-                                      Log.d(TAG, "CompletableFuture.thenRun() endpoint.cluster.getEndpoint: " + cluster.getEndpoint());
-                                      MatterCommands.ContentLauncherClusterLaunchURLCommand command = cluster.getCommand(MatterCommands.ContentLauncherClusterLaunchURLCommand.class);
-                                      Log.d(TAG, "CompletableFuture.thenRun() endpoint.cluster.getEndpoint: " + command);
-
-                                      MatterCommands.ContentLauncherClusterLaunchURLRequest request = new MatterCommands.ContentLauncherClusterLaunchURLRequest();
-                                      request.contentURL = "testurl";
-                                      request.displayString = Optional.of("test string");
-                                      CompletableFuture<MatterCommands.ContentLauncherClusterResponse> responseFuture = command.invoke(request, null, 5000);
-                                      /*responseFuture.thenAccept(response -> {
-                                          Log.d(TAG, "Command CompletableFuture.thenAccept() response " + response);
-                                      });*/
+                                      if(endpoint.hasCluster(MatterClusters.ContentLauncherCluster.class))
+                                      {
+                                          MatterClusters.ContentLauncherCluster cluster = endpoint.getCluster(MatterClusters.ContentLauncherCluster.class);
+                                          Log.d(TAG, "CompletableFuture.thenRun() endpoint.cluster: " + cluster);
+                                          Log.d(TAG, "CompletableFuture.thenRun() endpoint.cluster.getEndpoint: " + cluster.getEndpoint());
+                                          MatterCommands.ContentLauncherClusterLaunchURLCommand command = cluster.getCommand(MatterCommands.ContentLauncherClusterLaunchURLCommand.class);
+                                          if(command != null)
+                                          {
+                                              Log.d(TAG, "CompletableFuture.thenRun() endpoint.cluster.getEndpoint: " + command);
+
+                                              MatterCommands.ContentLauncherClusterLaunchURLRequest request = new MatterCommands.ContentLauncherClusterLaunchURLRequest();
+                                              request.contentURL = "testurl";
+                                              request.displayString = Optional.of("test string");
+                                              CompletableFuture<MatterCommands.ContentLauncherClusterResponse> responseFuture = command.invoke(request, null, 5000);
+                                          /*responseFuture.thenAccept(response -> {
+                                            Log.d(TAG, "Command CompletableFuture.thenAccept() response " + response);
+                                           });*/
+                                          }
+                                      }
                                   }
 
                                   connectionFragmentNextButton.setEnabled(true);

diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/Endpoint-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/Endpoint-JNI.cpp
@@ -101,7 +101,7 @@ JNI_METHOD(jobject, getCluster)
     {
         matter::casting::memory::Strong<matter::casting::clusters::content_launcher::ContentLauncherCluster> 
             contentLauncherCluster = endpoint->GetCluster<matter::casting::clusters::content_launcher::ContentLauncherCluster>();
-
+            
         jobject clusterJavaObject = support::createJCluster(
                             contentLauncherCluster, 
                             "com/matter/casting/clusters/MatterClusters$ContentLauncherCluster");

diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/ClusterConverter-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/ClusterConverter-JNI.cpp
@@ -28,6 +28,7 @@ using namespace chip;
 jobject createJCluster(matter::casting::memory::Strong<core::BaseCluster> cluster, const char * className)
 {
     ChipLogProgress(AppServer, "ClusterConverter-JNI.createJCluster() called");
+    VerifyOrReturnValue(cluster.get() != nullptr, nullptr, ChipLogError(AppServer, "ClusterConverter-JNI::createJCluster() cluster.get() == nullptr"));
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
 
     // Get a reference to the cluster's Java class

diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/CommandConverter-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/CommandConverter-JNI.cpp
@@ -28,6 +28,7 @@ using namespace chip;
 jobject createJCommand(void * command, const char * className)
 {
     ChipLogProgress(AppServer, "CommandConverter-JNI.createJCommand() called");
+    VerifyOrReturnValue(command != nullptr, nullptr, ChipLogError(AppServer, "CommandConverter-JNI::createJCommand() command == nullptr"));
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
 
     // Get a reference to the command's Java class

diff --git a/examples/tv-casting-app/tv-casting-common/support/CastingStore.cpp b/examples/tv-casting-app/tv-casting-common/support/CastingStore.cpp
@@ -390,6 +390,7 @@ std::vector<core::CastingPlayer> CastingStore::ReadAll()
 
                         endpointAttributesList.push_back(endpointAttributes);
                         endpointServerListMap[endpointAttributes.mId] = serverList;
+                        serverList.clear();
                         continue;
                     }
                 }