Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restyle Feedback from Android commissioning fixes #21928

Merged
merged 3 commits into from
Aug 16, 2022
Merged

Restyle Feedback from Android commissioning fixes #21928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8d4e96
Restyled by whitespace
restyled-commits Aug 16, 2022
2b03b63
Restyled by google-java-format
restyled-commits Aug 16, 2022
41eab58
Restyled by clang-format
restyled-commits Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/controller/CHIPDeviceController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
37 changes: 19 additions & 18 deletions src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
* <p>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.
*
* <p>When a NOCChainIssuer is set for this controller, the PartialDACVerifier will be used
* rather than the DefaultDACVerifier.
*
*
* <p>When a NOCChainIssuer is set for this controller, the PartialDACVerifier will be used rather
* than the DefaultDACVerifier.
*
* @param issuer
*/
public void setNOCChainIssuer(NOCChainIssuer issuer) {
Expand Down Expand Up @@ -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.
*
* <p>When a NOCChainIssuer is set for this controller, the PartialDACVerifier will be used
* rather than the DefaultDACVerifier.
*
Expand All @@ -728,10 +728,11 @@ public interface NOCChainIssuer {
* <p>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.
*
* <p>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. */
Expand Down