From 40484678d4e88dd0c6e09bb5fc1c5bb9fed86b23 Mon Sep 17 00:00:00 2001 From: "restyled-io[bot]" <32688539+restyled-io[bot]@users.noreply.github.com> Date: Tue, 16 Aug 2022 11:53:19 -0700 Subject: [PATCH] Restyle Feedback from Android commissioning fixes (#21928) * Restyled by whitespace * Restyled by google-java-format * Restyled by clang-format Co-authored-by: Restyled.io --- src/controller/CHIPDeviceController.h | 5 +-- .../ChipDeviceController.java | 37 ++++++++++--------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h index 53371ef3894a78..f5a4ddf281618a 100644 --- a/src/controller/CHIPDeviceController.h +++ b/src/controller/CHIPDeviceController.h @@ -565,10 +565,7 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController, * @brief * This function returns the current CommissioningStage for this commissioner. */ - CommissioningStage GetCommissioningStage() - { - return mCommissioningStage; - } + CommissioningStage GetCommissioningStage() { return mCommissioningStage; } #if CONFIG_NETWORK_LAYER_BLE #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java index c08182e038d560..97627b56c4ce1f 100644 --- a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java +++ b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java @@ -63,18 +63,18 @@ public void setScanNetworksListener(ScanNetworksListener listener) { } /** - * Sets this DeviceController to use the given issuer for issuing operational certs and - * verifying the DAC. By default, the DeviceController uses an internal, OperationalCredentialsDelegate - * (see AndroidOperationalCredentialsIssuer). + * Sets this DeviceController to use the given issuer for issuing operational certs and verifying + * the DAC. By default, the DeviceController uses an internal, OperationalCredentialsDelegate (see + * AndroidOperationalCredentialsIssuer). * - * When a NOCChainIssuer is set for this controller, then onNOCChainGenerationNeeded will be - * called when the NOC CSR needs to be signed and DAC verified. This allows for custom credentials - * issuer and DAC verifier implementations, for example, when a proprietary cloud API will perform + *

When a NOCChainIssuer is set for this controller, then onNOCChainGenerationNeeded will be + * called when the NOC CSR needs to be signed and DAC verified. This allows for custom credentials + * issuer and DAC verifier implementations, for example, when a proprietary cloud API will perform * DAC verification and the CSR signing. - * - *

When a NOCChainIssuer is set for this controller, the PartialDACVerifier will be used - * rather than the DefaultDACVerifier. - * + * + *

When a NOCChainIssuer is set for this controller, the PartialDACVerifier will be used rather + * than the DefaultDACVerifier. + * * @param issuer */ public void setNOCChainIssuer(NOCChainIssuer issuer) { @@ -700,10 +700,10 @@ protected void finalize() throws Throwable { public interface NOCChainIssuer { /** * When a NOCChainIssuer is set for this controller, then onNOCChainGenerationNeeded will be - * called when the DAC chain must be verified and NOC chain needs to be issued from a CSR. This allows for custom credentials - * issuer and DAC verifier implementations, for example, when a proprietary cloud API will perform - * DAC verification and the NOC chain issuance from CSR. - * + * called when the DAC chain must be verified and NOC chain needs to be issued from a CSR. This + * allows for custom credentials issuer and DAC verifier implementations, for example, when a + * proprietary cloud API will perform DAC verification and the NOC chain issuance from CSR. + * *

When a NOCChainIssuer is set for this controller, the PartialDACVerifier will be used * rather than the DefaultDACVerifier. * @@ -728,10 +728,11 @@ public interface NOCChainIssuer { *

Set the AttemptNetworkScanWiFi or AttemptNetworkScanThread to configure the enable/disable * WiFi or Thread network scan during commissioning in the the default CommissioningDelegate used * by the ChipDeviceCommissioner. - * - * When the callbacks onScanNetworksFailure or onScanNetworksSuccess are invoked, the commissioning - * flow has reached the kNeedsNetworkCreds and will wait to advance until this device controller's - * updateCommissioningNetworkCredentials method is called with the desired network credentials set. + * + *

When the callbacks onScanNetworksFailure or onScanNetworksSuccess are invoked, the + * commissioning flow has reached the kNeedsNetworkCreds and will wait to advance until this + * device controller's updateCommissioningNetworkCredentials method is called with the desired + * network credentials set. */ public interface ScanNetworksListener { /** Notifies when scan networks call fails. */