Remove warning message in java_controller

joonhaengHeo · Jun 19, 2024 · f72dc3d · f72dc3d
1 parent c184e33
commit f72dc3d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/...java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.kt b/...java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.kt
@@ -18,19 +18,21 @@
 package com.matter.controller.commands.pairing
 
 import chip.devicecontroller.ChipDeviceController
+import chip.devicecontroller.CommissionParameters
 import com.matter.controller.commands.common.CredentialsIssuer
 
 class PairCodeCommand(val controller: ChipDeviceController, credsIssue: CredentialsIssuer?) :
  PairingCommand(controller, "code", credsIssue, PairingModeType.CODE, PairingNetworkType.NONE) {
  override fun runCommand() {
+ val commissionParams =
+ CommissionParameters.Builder().setNetworkCredentials(getWifiNetworkCredentials()).build()
  currentCommissioner()
  .pairDeviceWithCode(
  getNodeId(),
  getOnboardingPayload(),
  getDiscoverOnce(),
  getUseOnlyOnNetworkDiscovery(),
- null,
- getWifiNetworkCredentials(),
+ commissionParams
  )
  currentCommissioner().setCompletionListener(this)
  waitCompleteMs(getTimeoutMillis())

diff --git a/...atter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.kt b/...atter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.kt
@@ -18,6 +18,7 @@
 package com.matter.controller.commands.pairing
 
 import chip.devicecontroller.ChipDeviceController
+import chip.devicecontroller.CommissionParameters
 import com.matter.controller.commands.common.CredentialsIssuer
 
 class PairCodeThreadCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) :
@@ -29,14 +30,15 @@ class PairCodeThreadCommand(controller: ChipDeviceController, credsIssue: Creden
  PairingNetworkType.THREAD
  ) {
  override fun runCommand() {
+ val commissionParams =
+ CommissionParameters.Builder().setNetworkCredentials(getThreadNetworkCredentials()).build()
  currentCommissioner()
  .pairDeviceWithCode(
  getNodeId(),
  getOnboardingPayload(),
  getDiscoverOnce(),
  getUseOnlyOnNetworkDiscovery(),
- null,
- getThreadNetworkCredentials(),
+ commissionParams
  )
  currentCommissioner().setCompletionListener(this)
  waitCompleteMs(getTimeoutMillis())

diff --git a/...-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.kt b/...-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.kt
@@ -18,6 +18,7 @@
 package com.matter.controller.commands.pairing
 
 import chip.devicecontroller.ChipDeviceController
+import chip.devicecontroller.CommissionParameters
 import com.matter.controller.commands.common.CredentialsIssuer
 
 class PairCodeWifiCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) :
@@ -29,14 +30,15 @@ class PairCodeWifiCommand(controller: ChipDeviceController, credsIssue: Credenti
  PairingNetworkType.WIFI
  ) {
  override fun runCommand() {
+ val commissionParams =
+ CommissionParameters.Builder().setNetworkCredentials(getWifiNetworkCredentials()).build()
  currentCommissioner()
  .pairDeviceWithCode(
  getNodeId(),
  getOnboardingPayload(),
  getDiscoverOnce(),
  getUseOnlyOnNetworkDiscovery(),
- null,
- getWifiNetworkCredentials(),
+ commissionParams
  )
  currentCommissioner().setCompletionListener(this)
  waitCompleteMs(getTimeoutMillis())