Skip to content

Commit 237e450

Browse files
[Android][ICD]Fix invalid signature for ICD onRefresh (#35714)
* Fix invalid signture for ICD onRefresh * Update ICDCheckInDelegateWrapper.java * Update AndroidCheckInDelegate.cpp
1 parent 6c0ba6e commit 237e450

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/controller/java/AndroidCheckInDelegate.cpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ RefreshKeySender * AndroidCheckInDelegate::OnKeyRefreshNeeded(ICDClientInfo & cl
9292
jniICDHmacKey)
9393

9494
jmethodID onKeyRefreshNeededMethodID = nullptr;
95-
err = chip::JniReferences::GetInstance().FindMethod(env, mCheckInDelegate.ObjectRef(), "onKeyRefreshNeeded", "(JJJJJ[B[B)V",
96-
&onKeyRefreshNeededMethodID);
95+
err = chip::JniReferences::GetInstance().FindMethod(env, mCheckInDelegate.ObjectRef(), "onKeyRefreshNeeded",
96+
"(JJJJJ[B[B)[B", &onKeyRefreshNeededMethodID);
9797
VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr,
9898
ChipLogProgress(ICD, "onKeyRefreshNeeded - FindMethod is failed! : %" CHIP_ERROR_FORMAT, err.Format()));
9999

@@ -122,6 +122,12 @@ RefreshKeySender * AndroidCheckInDelegate::OnKeyRefreshNeeded(ICDClientInfo & cl
122122
ChipLogError(ICD, "Generation of new key failed: %" CHIP_ERROR_FORMAT, err.Format());
123123
return nullptr;
124124
}
125+
err = newKey.SetLength(newKey.Capacity());
126+
if (err != CHIP_NO_ERROR)
127+
{
128+
ChipLogError(ICD, "Fail to set new key length with error: %" CHIP_ERROR_FORMAT, err.Format());
129+
return nullptr;
130+
}
125131
}
126132

127133
auto refreshKeySender = Platform::New<RefreshKeySender>(this, clientInfo, clientStorage, mpImEngine, newKey);

src/controller/java/src/chip/devicecontroller/ICDCheckInDelegateWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private byte[] onKeyRefreshNeeded(
6767
}
6868

6969
@SuppressWarnings("unused")
70-
private void onKeyRefreshDone(int errorCode) {
70+
private void onKeyRefreshDone(long errorCode) {
7171
delegate.onKeyRefreshDone(errorCode);
7272
}
7373
}

0 commit comments

Comments
 (0)