Addressed comments by andy31415, CommissionerPasscode change from uint8_t to bool

Author: pgregorr-amazon

examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/DiscoveryExampleFragment.java

@@ -352,8 +352,8 @@ private String getCastingPlayerButtonText(CastingPlayer player) {
     aux += (aux.isEmpty() ? "" : ", ") + "Resolved IP?: " + (player.getIpAddresses().size() > 0);
     aux +=
         (aux.isEmpty() ? "" : ", ")
-            + "Commissioner Passcode: "
-            + (player.getCommissionerPasscode());
+            + "CommissionerPasscode: "
+            + (player.isCommissionerPasscodeSupported());
 
     aux = aux.isEmpty() ? aux : "\n" + aux;
     return main + aux;

examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/CastingPlayer.java

@@ -49,7 +49,7 @@ public interface CastingPlayer {
 
   long getDeviceType();
 
-  short getCommissionerPasscode();
+  boolean isCommissionerPasscodeSupported();
 
   List<Endpoint> getEndpoints();
 

examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/MatterCastingPlayer.java

@@ -47,7 +47,12 @@ public class MatterCastingPlayer implements CastingPlayer {
   private int productId;
   private int vendorId;
   private long deviceType;
-  private short commissionerPasscode;
+  /**
+   * The CommissionerPasscode field indicates whether a CastingPlayer supports the
+   * Commissioner-Generated Passcode feature.
+   */
+  private boolean commissionerPasscode;
+
   protected long _cppCastingPlayer;
 
   public MatterCastingPlayer(
@@ -61,7 +66,7 @@ public MatterCastingPlayer(
       int productId,
       int vendorId,
       long deviceType,
-      short commissionerPasscode) {
+      boolean commissionerPasscode) {
     this.connected = connected;
     this.deviceId = deviceId;
     this.hostName = hostName;
@@ -135,7 +140,7 @@ public long getDeviceType() {
   }
 
   @Override
-  public short getCommissionerPasscode() {
+  public boolean isCommissionerPasscodeSupported() {
     return this.commissionerPasscode;
   }
 

examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/Converters-JNI.cpp

@@ -151,7 +151,7 @@ jobject convertCastingPlayerFromCppToJava(matter::casting::memory::Strong<core::
     // Get the constructor for the com/matter/casting/core/MatterCastingPlayer Java class
     jmethodID constructor =
         env->GetMethodID(matterCastingPlayerJavaClass, "<init>",
-                         "(ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;IIIJS)V");
+                         "(ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;IIIJZ)V");
     if (constructor == nullptr)
     {
         ChipLogError(AppServer, "convertCastingPlayerFromCppToJava() could not locate MatterCastingPlayer Java class constructor");
@@ -182,11 +182,12 @@ jobject convertCastingPlayerFromCppToJava(matter::casting::memory::Strong<core::
 
     // Create a new instance of the MatterCastingPlayer Java class
     jobject jMatterCastingPlayer = nullptr;
-    jMatterCastingPlayer         = env->NewObject(
-        matterCastingPlayerJavaClass, constructor, static_cast<jboolean>(player->IsConnected()), env->NewStringUTF(player->GetId()),
-        env->NewStringUTF(player->GetHostName()), env->NewStringUTF(player->GetDeviceName()),
-        env->NewStringUTF(player->GetInstanceName()), jIpAddressList, (jint) (player->GetPort()), (jint) (player->GetProductId()),
-        (jint) (player->GetVendorId()), (jlong) (player->GetDeviceType()), static_cast<jbyte>(player->GetCommissionerPasscode()));
+    jMatterCastingPlayer =
+        env->NewObject(matterCastingPlayerJavaClass, constructor, static_cast<jboolean>(player->IsConnected()),
+                       env->NewStringUTF(player->GetId()), env->NewStringUTF(player->GetHostName()),
+                       env->NewStringUTF(player->GetDeviceName()), env->NewStringUTF(player->GetInstanceName()), jIpAddressList,
+                       (jint) (player->GetPort()), (jint) (player->GetProductId()), (jint) (player->GetVendorId()),
+                       (jlong) (player->GetDeviceType()), static_cast<jboolean>(player->isCommissionerPasscodeSupported()));
     if (jMatterCastingPlayer == nullptr)
     {
         ChipLogError(AppServer, "convertCastingPlayerFromCppToJava(): Could not create MatterCastingPlayer Java object");

examples/tv-casting-app/tv-casting-common/core/CastingPlayer.cpp

@@ -282,7 +282,7 @@ void CastingPlayer::LogDetail() const
     {
         ChipLogDetail(AppServer, "\tDevice Type: %" PRIu32, mAttributes.deviceType);
     }
-    ChipLogDetail(AppServer, "\tCommissioner Passcode: %u", mAttributes.commissionerPasscode);
+    ChipLogDetail(AppServer, "\tCommissionerPasscode: %s", mAttributes.commissionerPasscode ? "true" : "false");
     if (mAttributes.nodeId > 0)
     {
         ChipLogDetail(AppServer, "\tNode ID: 0x" ChipLogFormatX64, ChipLogValueX64(mAttributes.nodeId));

examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h

@@ -63,7 +63,10 @@ class CastingPlayerAttributes
     uint16_t productId;
     uint16_t vendorId;
     uint32_t deviceType;
-    uint8_t commissionerPasscode = 0; // Indicates whether a CastingPlayer supports the Commissioner-Generated Passcode feature.
+    /**
+     * The CommissionerPasscode field indicates whether a CastingPlayer supports the Commissioner-Generated Passcode feature.
+     */
+    bool commissionerPasscode;
 
     chip::NodeId nodeId           = 0;
     chip::FabricIndex fabricIndex = 0;
@@ -183,7 +186,7 @@ class CastingPlayer : public std::enable_shared_from_this<CastingPlayer>
 
     uint32_t GetDeviceType() const { return mAttributes.deviceType; }
 
-    uint8_t GetCommissionerPasscode() const { return mAttributes.commissionerPasscode; }
+    bool isCommissionerPasscodeSupported() const { return mAttributes.commissionerPasscode; }
 
     chip::NodeId GetNodeId() const { return mAttributes.nodeId; }
 

examples/tv-casting-app/tv-casting-common/support/CastingStore.cpp

@@ -480,8 +480,8 @@ CHIP_ERROR CastingStore::WriteAll(std::vector<core::CastingPlayer> castingPlayer
         ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerVendorIdTag), castingPlayer.GetVendorId()));
         ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerProductIdTag), castingPlayer.GetProductId()));
         ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerDeviceTypeIdTag), castingPlayer.GetDeviceType()));
-        ReturnErrorOnFailure(
-            tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerCommissionerPasscodeTag), castingPlayer.GetCommissionerPasscode()));
+        ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerCommissionerPasscodeTag),
+                                           castingPlayer.isCommissionerPasscodeSupported()));
         ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerPortTag), castingPlayer.GetPort()));
         ReturnErrorOnFailure(tlvWriter.PutBytes(chip::TLV::ContextTag(kCastingPlayerInstanceNameTag),
                                                 (const uint8_t *) castingPlayer.GetInstanceName(),

examples/tv-casting-app/tv-casting-common/support/CastingStore.h

@@ -83,7 +83,6 @@ class CastingStore : public chip::FabricTable::Delegate
         kCastingPlayerPortTag,
         kCastingPlayerInstanceNameTag,
         kCastingPlayerDeviceNameTag,
-        kCastingPlayerCommissionerPasscodeTag,
         kCastingPlayerHostNameTag,
 
         kCastingPlayerEndpointsContainerTag,
@@ -98,6 +97,8 @@ class CastingStore : public chip::FabricTable::Delegate
         kCastingPlayerEndpointServerListContainerTag,
         kCastingPlayerEndpointServerClusterIdTag,
 
+        kCastingPlayerCommissionerPasscodeTag,
+
         kContextTagMaxNum = UINT8_MAX
     };
 

src/lib/dnssd/TxtFields.cpp

@@ -185,7 +185,7 @@ void GetPairingInstruction(const ByteSpan & value, char * pairingInstruction)
 
 uint8_t GetCommissionerPasscode(const ByteSpan & value)
 {
-    return MakeU8FromAsciiDecimal(value);
+    return MakeBoolFromAsciiDecimal(value);
 }
 
 Optional<System::Clock::Milliseconds32> GetRetryInterval(const ByteSpan & value)

src/lib/dnssd/Types.h

@@ -214,7 +214,7 @@ struct DnssdNodeData
     uint16_t productId                                        = 0;
     uint16_t pairingHint                                      = 0;
     uint8_t commissioningMode                                 = 0;
-    uint8_t commissionerPasscode                              = 0;
+    bool commissionerPasscode                                 = 0;
     uint8_t rotatingId[kMaxRotatingIdLen]                     = {};
     char instanceName[Commission::kInstanceNameMaxLength + 1] = {};
     char deviceName[kMaxDeviceNameLen + 1]                    = {};
@@ -272,10 +272,7 @@ struct DnssdNodeData
             ChipLogDetail(Discovery, "\tInstance Name: %s", instanceName);
         }
         ChipLogDetail(Discovery, "\tCommissioning Mode: %u", commissioningMode);
-        if (commissionerPasscode > 0)
-        {
-            ChipLogDetail(Discovery, "\tCommissioner Passcode: %u", commissionerPasscode);
-        }
+        ChipLogDetail(Discovery, "\tCommissionerPasscode: %s", commissionerPasscode ? "true" : "false");
     }
 };