Return custom status code in invoke response callback (#29398)

* Return custom status code in invoke response callback * Restyled by clang-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
project-chip · Oct 11, 2023 · 6c7b7c0 · 6c7b7c0
1 parent b261701
commit 6c7b7c0
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp
@@ -832,7 +832,16 @@ void InvokeCallback::OnResponse(app::CommandSender * apCommandSender, const app:
  VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Unable to find onResponse method: %s", ErrorStr(err)));
 
  DeviceLayer::StackUnlock unlock;
- env->CallVoidMethod(mJavaCallbackRef, onResponseMethod, invokeElementObj, static_cast<jlong>(aStatusIB.mStatus));
+ if (aStatusIB.mClusterStatus.HasValue())
+ {
+ env->CallVoidMethod(mJavaCallbackRef, onResponseMethod, invokeElementObj,
+ static_cast<jlong>(aStatusIB.mClusterStatus.Value()));
+ }
+ else
+ {
+ env->CallVoidMethod(mJavaCallbackRef, onResponseMethod, invokeElementObj,
+ static_cast<jlong>(Protocols::InteractionModel::Status::Success));
+ }
  VerifyOrReturn(!env->ExceptionCheck(), env->ExceptionDescribe());
 }