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.

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

Remove log only delegate bridge from darwin chip controller #15737

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/darwin/Framework/CHIP/CHIPDeviceController.mm
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ - (BOOL)startup:(_Nullable id<CHIPPersistentStorageDelegate>)storageDelegate
params.fabricStorage = _fabricStorage;
params.fabricIndependentStorage = _persistentStorageDelegateBridge;
commissionerParams.storageDelegate = _persistentStorageDelegateBridge;
commissionerParams.deviceAddressUpdateDelegate = _pairingDelegateBridge;
commissionerParams.deviceAddressUpdateDelegate = nullptr;
commissionerParams.pairingDelegate = _pairingDelegateBridge;

commissionerParams.operationalCredentialsDelegate = _operationalCredentialsDelegate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@

NS_ASSUME_NONNULL_BEGIN

class CHIPDevicePairingDelegateBridge : public chip::Controller::DevicePairingDelegate,
public chip::Controller::DeviceAddressUpdateDelegate
class CHIPDevicePairingDelegateBridge : public chip::Controller::DevicePairingDelegate
{
public:
CHIPDevicePairingDelegateBridge();
Expand All @@ -40,8 +39,6 @@ class CHIPDevicePairingDelegateBridge : public chip::Controller::DevicePairingDe

void OnCommissioningComplete(chip::NodeId deviceId, CHIP_ERROR error) override;

void OnAddressUpdateComplete(chip::NodeId nodeId, CHIP_ERROR error) override;

private:
id<CHIPDevicePairingDelegate> mDelegate;
dispatch_queue_t mQueue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,3 @@
}
}
}

void CHIPDevicePairingDelegateBridge::OnAddressUpdateComplete(chip::NodeId nodeId, CHIP_ERROR error)
{
// Todo, is there any benefit of exposing this anymore?
NSLog(@"OnAddressUpdateComplete. Status %s", chip::ErrorStr(error));
}