Merge branch 'master' into bugfix/23169

examples/dynamic-bridge-app/linux/DynamicDevice.cpp

@@ -17,12 +17,27 @@
  *    limitations under the License.
  */
 
+#include <app-common/zap-generated/af-structs.h>
+#include <app-common/zap-generated/attribute-id.h>
+#include <app-common/zap-generated/cluster-id.h>
+
 #include "DynamicDevice.h"
 
 #define DEVICE_TYPE_BRIDGED_NODE 0x0013
 // Device Version for dynamic endpoints:
 #define DEVICE_VERSION_DEFAULT 1
 
+namespace {
+static const int kDescriptorAttributeArraySize = 254;
+
+DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(descriptorAttrs)
+DECLARE_DYNAMIC_ATTRIBUTE(ZCL_DEVICE_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0),     /* device list */
+    DECLARE_DYNAMIC_ATTRIBUTE(ZCL_SERVER_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* server list */
+    DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CLIENT_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* client list */
+    DECLARE_DYNAMIC_ATTRIBUTE(ZCL_PARTS_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0),  /* parts list */
+    DECLARE_DYNAMIC_ATTRIBUTE_LIST_END();
+} // namespace
+
 DynamicDevice::DynamicDevice() {}
 
 void DynamicDevice::AddDeviceType(EmberAfDeviceType type)
@@ -34,10 +49,14 @@ Device DynamicDevice::CreateDevice()
 {
     // All nodes are bridged devices.
     mDeviceTypes.push_back(EmberAfDeviceType{ DEVICE_TYPE_BRIDGED_NODE, DEVICE_VERSION_DEFAULT });
-    mVersions.resize(mClusterRawPtrs.size());
+    mVersions.resize(mClusterRawPtrs.size() + 1); // +1 for the descriptor cluster
     for (auto * c : mClusterRawPtrs)
         mClusterBaseRawPtrs.push_back(c);
 
+    // Force a default descriptor cluster to be present.
+    mClusterDecls.emplace_back(
+        EmberAfCluster DECLARE_DYNAMIC_CLUSTER(ZCL_DESCRIPTOR_CLUSTER_ID, descriptorAttrs, nullptr, nullptr));
+
     return Device(chip::Span<chip::DataVersion>(mVersions.data(), mVersions.size()),
                   chip::Span<EmberAfCluster>(mClusterDecls.data(), mClusterDecls.size()),
                   chip::Span<ClusterInterface *>(mClusterBaseRawPtrs.data(), mClusterBaseRawPtrs.size()),

examples/dynamic-bridge-app/linux/main.cpp

@@ -294,8 +294,12 @@ int main(int argc, char * argv[])
     clusterAccess.reserve(std::extent<decltype(clusters::kKnownClusters)>::value);
     for (auto & entry : clusters::kKnownClusters)
     {
-        clusterAccess.emplace_back(chip::Optional<EndpointId>(), entry.id);
-        registerAttributeAccessOverride(&clusterAccess.back());
+        // Desciptor clusters should not be overridden.
+        if (entry.id != chip::app::Clusters::Descriptor::Id)
+        {
+            clusterAccess.emplace_back(chip::Optional<EndpointId>(), entry.id);
+            registerAttributeAccessOverride(&clusterAccess.back());
+        }
     }
 
     ChipLinuxAppMainLoop();

examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CastingContext.java

@@ -1,7 +1,6 @@
 package com.chip.casting.app;
 
 import android.content.Context;
-import android.net.nsd.NsdManager;
 import android.widget.LinearLayout;
 import androidx.fragment.app.FragmentActivity;
 
@@ -20,11 +19,6 @@ public FragmentActivity getFragmentActivity() {
     return fragmentActivity;
   }
 
-  public NsdManager getNsdManager() {
-    return (NsdManager)
-        fragmentActivity.getApplicationContext().getSystemService(Context.NSD_SERVICE);
-  }
-
   public LinearLayout getCommissionersLayout() {
     return (LinearLayout) fragmentActivity.findViewById(R.id.castingCommissioners);
   }

examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java

@@ -4,39 +4,46 @@
 import android.net.nsd.NsdManager;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
-import com.chip.casting.dnssd.CommissionerDiscoveryListener;
-import com.chip.casting.dnssd.DiscoveredNodeData;
-import com.chip.casting.util.GlobalCastingConstants;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
+import com.chip.casting.DiscoveredNodeData;
+import com.chip.casting.FailureCallback;
+import com.chip.casting.MatterError;
+import com.chip.casting.SuccessCallback;
+import com.chip.casting.TvCastingApp;
 
 /** A {@link Fragment} to discover commissioners on the network */
 public class CommissionerDiscoveryFragment extends Fragment {
   private static final String TAG = CommissionerDiscoveryFragment.class.getSimpleName();
+  private static final long DISCOVERY_DURATION_SECS = 10;
+  private final TvCastingApp tvCastingApp;
 
-  public CommissionerDiscoveryFragment() {}
+  public CommissionerDiscoveryFragment(TvCastingApp tvCastingApp) {
+    this.tvCastingApp = tvCastingApp;
+  }
 
   /**
    * Use this factory method to create a new instance of this fragment using the provided
    * parameters.
    *
    * @return A new instance of fragment CommissionerDiscoveryFragment.
    */
-  public static CommissionerDiscoveryFragment newInstance() {
-    return new CommissionerDiscoveryFragment();
+  public static CommissionerDiscoveryFragment newInstance(TvCastingApp tvCastingApp) {
+    return new CommissionerDiscoveryFragment(tvCastingApp);
   }
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    startCommissionerDiscovery();
   }
 
   @Override
@@ -49,47 +56,84 @@ public View onCreateView(
   @Override
   public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
+
     Button manualCommissioningButton = getView().findViewById(R.id.manualCommissioningButton);
     Callback callback = (Callback) this.getActivity();
-    manualCommissioningButton.setOnClickListener(
+    View.OnClickListener manualCommissioningButtonOnClickListener =
         new View.OnClickListener() {
           @Override
           public void onClick(View v) {
             callback.handleCommissioningButtonClicked(null);
           }
-        });
-  }
+        };
+    manualCommissioningButton.setOnClickListener(manualCommissioningButtonOnClickListener);
+
+    Context context = this.getContext();
+    Context applicationContext = this.getContext().getApplicationContext();
+
+    SuccessCallback<DiscoveredNodeData> successCallback =
+        new SuccessCallback<DiscoveredNodeData>() {
+          @Override
+          public void handle(DiscoveredNodeData discoveredNodeData) {
+            Log.d(TAG, "Discovered a Video Player Commissioner: " + discoveredNodeData);
+            String buttonText = getCommissionerButtonText(discoveredNodeData);
 
-  private void startCommissionerDiscovery() {
-    Log.d(TAG, "CommissionerDiscoveryFragment.startCommissionerDiscovery called");
-    WifiManager wifi = (WifiManager) this.getContext().getSystemService(Context.WIFI_SERVICE);
-    WifiManager.MulticastLock multicastLock = wifi.createMulticastLock("multicastLock");
-    multicastLock.setReferenceCounted(true);
-    multicastLock.acquire();
+            if (!buttonText.isEmpty()) {
+              Button commissionerButton = new Button(context);
+              commissionerButton.setText(buttonText);
+              CommissionerDiscoveryFragment.Callback callback =
+                  (CommissionerDiscoveryFragment.Callback) getActivity();
+              commissionerButton.setOnClickListener(
+                  new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                      Log.d(
+                          TAG,
+                          "CommissionerResolveListener.onServiceResolved.OnClickListener.onClick called for "
+                              + discoveredNodeData);
+                      callback.handleCommissioningButtonClicked(discoveredNodeData);
+                    }
+                  });
+              new Handler(Looper.getMainLooper())
+                  .post(
+                      () ->
+                          ((LinearLayout) getActivity().findViewById(R.id.castingCommissioners))
+                              .addView(commissionerButton));
+            }
+          }
+        };
 
-    CastingContext castingContext = new CastingContext(this.getActivity());
-    NsdManager.DiscoveryListener commissionerDiscoveryListener =
-        new CommissionerDiscoveryListener(castingContext);
+    FailureCallback failureCallback =
+        new FailureCallback() {
+          @Override
+          public void handle(MatterError matterError) {
+            Log.e(TAG, "Error occurred during video player commissioner discovery: " + matterError);
+          }
+        };
 
-    NsdManager nsdManager = castingContext.getNsdManager();
-    nsdManager.discoverServices(
-        GlobalCastingConstants.CommissionerServiceType,
-        NsdManager.PROTOCOL_DNS_SD,
-        commissionerDiscoveryListener);
+    tvCastingApp.discoverVideoPlayerCommissioners(
+        (WifiManager) context.getSystemService(Context.WIFI_SERVICE),
+        (NsdManager) applicationContext.getSystemService(Context.NSD_SERVICE),
+        DISCOVERY_DURATION_SECS,
+        successCallback,
+        failureCallback);
+  }
 
-    // Stop discovery after specified timeout
-    Executors.newSingleThreadScheduledExecutor()
-        .schedule(
-            new Runnable() {
-              @Override
-              public void run() {
-                nsdManager.stopServiceDiscovery(commissionerDiscoveryListener);
-                multicastLock.release();
-              }
-            },
-            10,
-            TimeUnit.SECONDS);
-    Log.d(TAG, "CommissionerDiscoveryFragment.startCommissionerDiscovery ended");
+  @VisibleForTesting
+  public String getCommissionerButtonText(DiscoveredNodeData commissioner) {
+    String main = commissioner.getDeviceName() != null ? commissioner.getDeviceName() : "";
+    String aux =
+        "" + (commissioner.getProductId() > 0 ? "Product ID: " + commissioner.getProductId() : "");
+    aux +=
+        commissioner.getDeviceType() > 0
+            ? (aux.isEmpty() ? "" : " ") + "Device Type: " + commissioner.getDeviceType()
+            : "";
+    aux +=
+        commissioner.getVendorId() > 0
+            ? (aux.isEmpty() ? "" : " from ") + "Vendor ID: " + commissioner.getVendorId()
+            : "";
+    aux = aux.isEmpty() ? aux : "\n[" + aux + "]";
+    return main + aux;
   }
 
   /** Interface for notifying the host. */

examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissioningFragment.java

@@ -8,10 +8,14 @@
 import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import com.chip.casting.ContentApp;
+import com.chip.casting.DiscoveredNodeData;
+import com.chip.casting.FailureCallback;
 import com.chip.casting.MatterCallbackHandler;
 import com.chip.casting.MatterError;
+import com.chip.casting.SuccessCallback;
 import com.chip.casting.TvCastingApp;
-import com.chip.casting.dnssd.DiscoveredNodeData;
+import com.chip.casting.VideoPlayer;
 import com.chip.casting.util.GlobalCastingConstants;
 
 /** A {@link Fragment} to get the TV Casting App commissioned. */
@@ -56,9 +60,25 @@ public View onCreateView(
               @Override
               public void handle(MatterError error) {
                 Log.d(TAG, "handle() called on CommissioningComplete event with " + error);
-                if (error.isNoError()) {
-                  callback.handleCommissioningComplete();
-                }
+              }
+            },
+            new SuccessCallback<VideoPlayer>() {
+              @Override
+              public void handle(VideoPlayer videoPlayer) {
+                Log.d(TAG, "handle() called on OnConnectionSuccess with " + videoPlayer);
+                callback.handleCommissioningComplete();
+              }
+            },
+            new FailureCallback() {
+              @Override
+              public void handle(MatterError matterError) {
+                Log.d(TAG, "handle() called on OnConnectionFailure with " + matterError);
+              }
+            },
+            new SuccessCallback<ContentApp>() {
+              @Override
+              public void handle(ContentApp contentApp) {
+                Log.d(TAG, "handle() called on OnNewOrUpdatedEndpoint with " + contentApp);
               }
             });
     if (this.openCommissioningWindowSuccess) {
@@ -71,9 +91,7 @@ public void handle(MatterError error) {
                 + " port: "
                 + selectedCommissioner.getPort());
 
-        this.sendUdcSuccess =
-            tvCastingApp.sendUserDirectedCommissioningRequest(
-                ipAddress, selectedCommissioner.getPort());
+        this.sendUdcSuccess = tvCastingApp.sendCommissioningRequest(selectedCommissioner);
       }
     }
 

examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ContentLauncherFragment.java

@@ -9,6 +9,7 @@
 import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import com.chip.casting.ContentApp;
 import com.chip.casting.MatterCallbackHandler;
 import com.chip.casting.MatterError;
 import com.chip.casting.TvCastingApp;
@@ -21,6 +22,8 @@ public class ContentLauncherFragment extends Fragment {
 
   private View.OnClickListener launchUrlButtonClickListener;
 
+  private static final ContentApp kContentApp = new ContentApp((short) 4, null);
+
   public ContentLauncherFragment(TvCastingApp tvCastingApp) {
     this.tvCastingApp = tvCastingApp;
   }
@@ -52,6 +55,7 @@ public void onClick(View v) {
             EditText contentDisplayString =
                 getView().findViewById(R.id.contentDisplayStringEditText);
             tvCastingApp.contentLauncherLaunchURL(
+                kContentApp,
                 contentUrl.getText().toString(),
                 contentDisplayString.getText().toString(),
                 new MatterCallbackHandler() {

examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/MainActivity.java

@@ -16,8 +16,8 @@
 import chip.platform.PreferencesConfigurationManager;
 import chip.platform.PreferencesKeyValueStoreManager;
 import com.chip.casting.DACProviderStub;
+import com.chip.casting.DiscoveredNodeData;
 import com.chip.casting.TvCastingApp;
-import com.chip.casting.dnssd.DiscoveredNodeData;
 import com.chip.casting.util.GlobalCastingConstants;
 
 public class MainActivity extends AppCompatActivity
@@ -37,7 +37,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     initJni();
 
-    Fragment fragment = CommissionerDiscoveryFragment.newInstance();
+    Fragment fragment = CommissionerDiscoveryFragment.newInstance(tvCastingApp);
     getSupportFragmentManager()
         .beginTransaction()
         .add(R.id.main_fragment_container, fragment, fragment.getClass().getSimpleName())

examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/MediaPlaybackFragment.java

@@ -8,6 +8,7 @@
 import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import com.chip.casting.ContentApp;
 import com.chip.casting.FailureCallback;
 import com.chip.casting.MatterError;
 import com.chip.casting.MediaPlaybackTypes;
@@ -23,6 +24,8 @@ public class MediaPlaybackFragment extends Fragment {
 
   private View.OnClickListener subscribeToCurrentStateButtonClickListener;
 
+  private static final ContentApp kContentApp = new ContentApp((short) 4, null);
+
   public MediaPlaybackFragment(TvCastingApp tvCastingApp) {
     this.tvCastingApp = tvCastingApp;
   }
@@ -107,6 +110,7 @@ public void run() {
 
             boolean retVal =
                 tvCastingApp.mediaPlayback_subscribeToCurrentState(
+                    kContentApp,
                     successCallback,
                     failureCallback,
                     Integer.parseInt(minInterval.getText().toString()),