Skip to content

Commit 6c051bc

Browse files
remove unnecessary check-in delegate since the ChipToolCheckInDelegate is enough for chip-tool icd usage
1 parent 8ebadd4 commit 6c051bc

File tree

4 files changed

+0
-61
lines changed

4 files changed

+0
-61
lines changed

examples/chip-tool/commands/common/CHIPCommand.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -655,12 +655,3 @@ void CHIPCommand::ExecuteDeferredCleanups(intptr_t ignored)
655655
sDeferredCleanups.clear();
656656
}
657657

658-
void CHIPCommand::SetOnCheckInCompleteCallback(CheckInCompleteCallback * handler)
659-
{
660-
sCheckInDelegate.SetOnCheckInCompleteCallback(handler);
661-
}
662-
663-
void CHIPCommand::UnsetOnCheckInCompleteCallback()
664-
{
665-
sCheckInDelegate.UnsetOnCheckInCompleteCallback();
666-
}

examples/chip-tool/commands/common/CHIPCommand.h

-4
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,6 @@ class CHIPCommand : public Command
180180

181181
ChipDeviceCommissioner & GetCommissioner(std::string identity);
182182

183-
static void SetOnCheckInCompleteCallback(CheckInCompleteCallback * handler);
184-
185-
static void UnsetOnCheckInCompleteCallback();
186-
187183
private:
188184
CHIP_ERROR MaybeSetUpStack();
189185
void MaybeTearDownStack();

examples/chip-tool/commands/common/ChipToolCheckInDelegate.cpp

-14
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ void ChipToolCheckInDelegate::OnCheckInComplete(const ICDClientInfo & clientInfo
4040
ChipLogProgress(
4141
ICD, "Check In Message processing complete: start_counter=%" PRIu32 " offset=%" PRIu32 " nodeid=" ChipLogFormatScopedNodeId,
4242
clientInfo.start_icd_counter, clientInfo.offset, ChipLogValueScopedNodeId(clientInfo.peer_node));
43-
if (mpCheckInCompleteCallbacks != nullptr)
44-
{
45-
mpCheckInCompleteCallbacks->OnCheckInComplete(clientInfo);
46-
}
4743
}
4844

4945
RefreshKeySender * ChipToolCheckInDelegate::OnKeyRefreshNeeded(ICDClientInfo & clientInfo, ICDClientStorage * clientStorage)
@@ -78,13 +74,3 @@ void ChipToolCheckInDelegate::OnKeyRefreshDone(RefreshKeySender * refreshKeySend
7874
refreshKeySender = nullptr;
7975
}
8076
}
81-
82-
void ChipToolCheckInDelegate::SetOnCheckInCompleteCallback(CheckInCompleteCallback * handler)
83-
{
84-
mpCheckInCompleteCallbacks = handler;
85-
}
86-
87-
void ChipToolCheckInDelegate::UnsetOnCheckInCompleteCallback()
88-
{
89-
mpCheckInCompleteCallbacks = nullptr;
90-
}

examples/chip-tool/commands/common/ChipToolCheckInDelegate.h

-34
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,6 @@
2424
#include <app/icd/client/CheckInDelegate.h>
2525
#include <app/icd/client/ICDClientStorage.h>
2626

27-
class CheckInCompleteCallback
28-
{
29-
public:
30-
virtual ~CheckInCompleteCallback() {}
31-
32-
/**
33-
* @brief Callback used to let the application know that a check-in message was received and validated.
34-
*
35-
* The callback will be executed in CHIP main loop. Implementations should avoid blocking operations in this callback.
36-
*
37-
* @param[in] clientInfo - ICDClientInfo object representing the state associated with the
38-
* node that sent the check-in message.
39-
*/
40-
virtual void OnCheckInComplete(const chip::app::ICDClientInfo & clientInfo) = 0;
41-
};
42-
4327
class ChipToolCheckInDelegate : public chip::app::CheckInDelegate
4428
{
4529
public:
@@ -50,25 +34,7 @@ class ChipToolCheckInDelegate : public chip::app::CheckInDelegate
5034
chip::app::ICDClientStorage * clientStorage) override;
5135
void OnKeyRefreshDone(chip::app::RefreshKeySender * refreshKeySender, CHIP_ERROR error) override;
5236

53-
/**
54-
* @brief Sets a callback for when the Check-In processing completes.
55-
*
56-
* This method does not consider the race condition that the callback is changed during OnCheckInComplete.
57-
*
58-
* @param[in] handler - A pointer to the CheckInCompleteCallback to register.
59-
*/
60-
void SetOnCheckInCompleteCallback(CheckInCompleteCallback * handler);
61-
62-
/**
63-
* @brief Unsets the callback for when the Check-In processing completes.
64-
*
65-
* This method does not consider the race condition that the callback is changed during OnCheckInComplete.
66-
*/
67-
void UnsetOnCheckInCompleteCallback();
68-
6937
private:
7038
chip::app::ICDClientStorage * mpStorage = nullptr;
7139
chip::app::InteractionModelEngine * mpImEngine = nullptr;
72-
73-
CheckInCompleteCallback * mpCheckInCompleteCallbacks;
7440
};

0 commit comments

Comments
 (0)