Address review comments

project-chip · Dec 22, 2023 · dec780d · dec780d
1 parent 5cbfa7a
commit dec780d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/app/CASESessionManager.h b/src/app/CASESessionManager.h
@@ -129,6 +129,9 @@ class CASESessionManager : public OperationalSessionReleaseDelegate, public Sess
      * The `attemptCount` parameter can be used to automatically retry multiple times if session setup is
      * not successful.
      *
+     * This function allows passing 'nullptr' for the error handler to compile, which is useful in scenarios where error
+     * handling is not needed.
+     *
      * @param peerId The node ID to find or establish a session with.
      * @param onConnection A callback to be called upon successful connection establishment.
      * @param attemptCount The number of retry attempts if session setup fails (default is 1).

diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp
@@ -138,7 +138,7 @@ void GetConnectedDeviceCallback::OnDeviceConnectionFailureFn(void * context,
 
     jthrowable exception;
     CHIP_ERROR err = AndroidConnectionFailureExceptions::GetInstance().CreateAndroidConnectionFailureException(
-        env, ErrorStr(failureInfo.error), failureInfo.error.AsInteger(), failureInfo.sessionStage, exception);
+        env, failureInfo.error.Format(), failureInfo.error.AsInteger(), failureInfo.sessionStage, exception);
     VerifyOrReturn(
         err == CHIP_NO_ERROR,
         ChipLogError(Controller,

diff --git a/src/controller/java/AndroidConnectionFailureExceptions.cpp b/src/controller/java/AndroidConnectionFailureExceptions.cpp
@@ -30,14 +30,13 @@ CHIP_ERROR AndroidConnectionFailureExceptions::CreateAndroidConnectionFailureExc
                                                                                        jthrowable & outEx)
 {
     jclass controllerExceptionCls;
-    CHIP_ERROR err =
-        JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ConnectionFailureException", controllerExceptionCls);
+    CHIP_ERROR err = JniReferences::GetInstance().GetLocalClassRef(env, "chip/devicecontroller/ConnectionFailureException",
+                                                                   controllerExceptionCls);
     VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
-    JniClass controllerExceptionJniCls(controllerExceptionCls);
 
     jmethodID exceptionConstructor = env->GetMethodID(controllerExceptionCls, "<init>", "(JILjava/lang/String;)V");
-    outEx = (jthrowable) env->NewObject(controllerExceptionCls, exceptionConstructor, static_cast<jlong>(errorCode),
-                                        static_cast<jint>(state), env->NewStringUTF(message));
+    outEx = static_cast<jthrowable>(env->NewObject(controllerExceptionCls, exceptionConstructor, static_cast<jlong>(errorCode),
+                                                   static_cast<jint>(state), env->NewStringUTF(message)));
     VerifyOrReturnError(outEx != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
     return CHIP_NO_ERROR;
 }