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

[Android] Fix onReport status #32167

Merged
merged 1 commit into from
Feb 17, 2024
Merged

[Android] Fix onReport status #32167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/controller/java/AndroidCallbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,8 @@ void ReportCallback::OnAttributeData(const app::ConcreteDataAttributePath & aPat
jobject wrapperCallback = mWrapperCallbackRef.ObjectRef();

jobject nodeState = GetNodeStateObj(env, mNodeStateClassSignature, wrapperCallback);
if (aStatus.IsFailure())

{
ChipLogError(Controller, "Receive bad status %s", ErrorStr(aStatus.ToChipError()));
// Add Attribute Status to wrapperCallback
jmethodID addAttributeStatusMethod = nullptr;
err = JniReferences::GetInstance().FindMethod(env, nodeState, "addAttributeStatus", "(IJJILjava/lang/Integer;)V",
Expand All @@ -305,8 +304,10 @@ void ReportCallback::OnAttributeData(const app::ConcreteDataAttributePath & aPat
static_cast<jlong>(aPath.mClusterId), static_cast<jlong>(aPath.mAttributeId),
static_cast<jint>(aStatus.mStatus), jClusterState);
VerifyOrReturn(!env->ExceptionCheck(), env->ExceptionDescribe());
return;
}

VerifyOrReturn(aStatus.IsSuccess(), ChipLogError(Controller, "Receive bad status %s", ErrorStr(aStatus.ToChipError()));
aPath.LogPath());
VerifyOrReturn(apData != nullptr, ChipLogError(Controller, "Receive empty apData"); aPath.LogPath());

TLV::TLVReader readerForJavaTLV;
Expand Down Expand Up @@ -415,9 +416,8 @@ void ReportCallback::OnEventData(const app::EventHeader & aEventHeader, TLV::TLV
ChipLogError(Controller, "mReportCallbackRef is not valid in %s", __func__));
jobject wrapperCallback = mWrapperCallbackRef.ObjectRef();
jobject nodeState = GetNodeStateObj(env, mNodeStateClassSignature, wrapperCallback);
if (apStatus != nullptr && apStatus->IsFailure())
if (apStatus != nullptr)
{
ChipLogError(Controller, "Receive bad status %s", ErrorStr(apStatus->ToChipError()));
// Add Event Status to NodeState
jmethodID addEventStatusMethod;
err = JniReferences::GetInstance().FindMethod(env, nodeState, "addEventStatus", "(IJJILjava/lang/Integer;)V",
Expand Down
Loading