Allow device does not support any method for rendezvous (#27557)

project-chip · Jul 19, 2023 · 1096468 · 1096468
1 parent 586b4c8
commit 1096468
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt b/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt
@@ -182,8 +182,8 @@ class OnboardingPayload(
  DiscoveryCapability.SOFT_AP
  )
 
- // If discoveryCapabilities is empty or discoveryCapabilities contains values outside of allValid
- if (discoveryCapabilities.isEmpty() || discoveryCapabilities.any { it !in allValid }) {
+ // If discoveryCapabilities is not empty and discoveryCapabilities contains values outside of allValid
+ if (!discoveryCapabilities.isEmpty() && discoveryCapabilities.any { it !in allValid }) {
  return false
  }
 

diff --git a/src/controller/java/src/chip/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt b/src/controller/java/src/chip/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt
@@ -90,10 +90,6 @@ private fun generateBitSet(
  populateBits(bits, offset, payload.vendorId.toLong(), kVendorIDFieldLengthInBits, kTotalPayloadDataSizeInBits)
  populateBits(bits, offset, payload.productId.toLong(), kProductIDFieldLengthInBits, kTotalPayloadDataSizeInBits)
  populateBits(bits, offset, payload.commissioningFlow.toLong(), kCommissioningFlowFieldLengthInBits, kTotalPayloadDataSizeInBits)
-
- if (payload.discoveryCapabilities.isEmpty())
- throw OnboardingPayloadException("Invalid argument")
-
  populateBits(bits, offset, payload.getRendezvousInformation(), kRendezvousInfoFieldLengthInBits, kTotalPayloadDataSizeInBits)
  populateBits(bits, offset, payload.discriminator.toLong(), kPayloadDiscriminatorFieldLengthInBits, kTotalPayloadDataSizeInBits) 
  populateBits(bits, offset, payload.setupPinCode, kSetupPINCodeFieldLengthInBits, kTotalPayloadDataSizeInBits)