Restyled by clang-format

joonhaengHeo · Apr 26, 2024 · 06453c7 · 06453c7
1 parent a5ba9fe
commit 06453c7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/src/controller/java/AndroidICDClient.cpp b/src/controller/java/AndroidICDClient.cpp
@@ -28,7 +28,7 @@
 
 chip::app::DefaultICDClientStorage sICDClientStorage;
 
-jobject getICDClientInfo(JNIEnv *env, const char * icdClientInfoSign, jint jFabricIndex)
+jobject getICDClientInfo(JNIEnv * env, const char * icdClientInfoSign, jint jFabricIndex)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -69,13 +69,15 @@ jobject getICDClientInfo(JNIEnv *env, const char * icdClientInfoSign, jint jFabr
             continue;
         }
 
-        err = chip::JniReferences::GetInstance().N2J_ByteArray(env, info.aes_key_handle.As<chip::Crypto::Symmetric128BitsKeyByteArray>(),
+        err = chip::JniReferences::GetInstance().N2J_ByteArray(env,
+                                                               info.aes_key_handle.As<chip::Crypto::Symmetric128BitsKeyByteArray>(),
                                                                chip::Crypto::CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES, jIcdAesKey);
         VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr,
                             ChipLogError(Controller, "ICD AES KEY N2J_ByteArray error!: %" CHIP_ERROR_FORMAT, err.Format()));
 
-        err = chip::JniReferences::GetInstance().N2J_ByteArray(env, info.hmac_key_handle.As<chip::Crypto::Symmetric128BitsKeyByteArray>(),
-                                                               chip::Crypto::CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES, jIcdHmacKey);
+        err = chip::JniReferences::GetInstance().N2J_ByteArray(
+            env, info.hmac_key_handle.As<chip::Crypto::Symmetric128BitsKeyByteArray>(),
+            chip::Crypto::CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES, jIcdHmacKey);
         VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr,
                             ChipLogError(Controller, "ICD HMAC KEY N2J_ByteArray error!: %" CHIP_ERROR_FORMAT, err.Format()));
 
@@ -89,6 +91,9 @@ jobject getICDClientInfo(JNIEnv *env, const char * icdClientInfoSign, jint jFabr
     }
 
     return jInfo;
- }
+}
 
-chip::app::DefaultICDClientStorage * getICDClientStorage() { return &sICDClientStorage; }
+chip::app::DefaultICDClientStorage * getICDClientStorage()
+{
+    return &sICDClientStorage;
+}
diff --git a/src/controller/java/AndroidICDClient.h b/src/controller/java/AndroidICDClient.h
@@ -24,9 +24,9 @@
 
 #pragma once
 
-#include <lib/support/JniReferences.h>
 #include <app/icd/client/DefaultICDClientStorage.h>
+#include <lib/support/JniReferences.h>
 
-jobject getICDClientInfo(JNIEnv *env, const char * icdClientInfoSign, jint jFabricIndex);
+jobject getICDClientInfo(JNIEnv * env, const char * icdClientInfoSign, jint jFabricIndex);
 
 chip::app::DefaultICDClientStorage * getICDClientStorage();
diff --git a/src/controller/java/AndroidInteractionClient.cpp b/src/controller/java/AndroidInteractionClient.cpp
@@ -831,7 +831,6 @@ jint getFabricIndex(jlong devicePtr)
     return static_cast<jint>(chipDevice->GetPeerScopedNodeId().GetFabricIndex());
 }
 
-
 /**
  * Takes objects in attributePathList, converts them to app:AttributePathParams, and appends them to outAttributePathParamsList.
  */

diff --git a/src/controller/java/CHIPICDClient-JNI.cpp b/src/controller/java/CHIPICDClient-JNI.cpp
@@ -19,8 +19,7 @@
 
 #include <platform/PlatformManager.h>
 
-#define JNI_METHOD(RETURN, METHOD_NAME)                                                                                            \
-    extern "C" JNIEXPORT RETURN JNICALL Java_chip_devicecontroller_ChipICDClient_##METHOD_NAME
+#define JNI_METHOD(RETURN, METHOD_NAME) extern "C" JNIEXPORT RETURN JNICALL Java_chip_devicecontroller_ChipICDClient_##METHOD_NAME
 
 JNI_METHOD(jobject, getICDClientInfo)(JNIEnv * env, jobject self, jint jFabricIndex)
 {

diff --git a/src/controller/java/MatterICDClient-JNI.cpp b/src/controller/java/MatterICDClient-JNI.cpp
@@ -19,8 +19,7 @@
 
 #include <platform/PlatformManager.h>
 
-#define JNI_METHOD(RETURN, METHOD_NAME)                                                                                            \
-    extern "C" JNIEXPORT RETURN JNICALL Java_matter_controller_MatterICDClientImpl_##METHOD_NAME
+#define JNI_METHOD(RETURN, METHOD_NAME) extern "C" JNIEXPORT RETURN JNICALL Java_matter_controller_MatterICDClientImpl_##METHOD_NAME
 
 JNI_METHOD(jobject, getICDClientInfo)(JNIEnv * env, jobject self, jint jFabricIndex)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -831,7 +831,6 @@ jint getFabricIndex(jlong devicePtr) @@
         return static_cast<jint>(chipDevice->GetPeerScopedNodeId().GetFabricIndex());
     }
     /**
      * Takes objects in attributePathList, converts them to app:AttributePathParams, and appends them to outAttributePathParamsList.
      */
@@ Expand Down @@