@@ -87,8 +87,6 @@ pthread_t sIOThread = PTHREAD_NULL;
87
87
88
88
jclass sChipDeviceControllerExceptionCls = NULL ;
89
89
90
- const char * PARAMS_CLASS = " ()Lchip/devicecontroller/ControllerParams;" ;
91
-
92
90
} // namespace
93
91
94
92
// NOTE: Remote device ID is in sync with the echo server device id
@@ -166,27 +164,31 @@ JNI_METHOD(jlong, newDeviceController)(JNIEnv * env, jobject self, jobject contr
166
164
167
165
// Retrieve initialization params.
168
166
jmethodID getUdpListenPort;
169
- err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getUdpListenPort" , PARAMS_CLASS , &getUdpListenPort);
167
+ err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getUdpListenPort" , " ()I " , &getUdpListenPort);
170
168
SuccessOrExit (err);
171
169
172
170
jmethodID getKeypairDelegate;
173
- err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getKeypairDelegate" , PARAMS_CLASS,
174
- &getKeypairDelegate);
171
+ err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getKeypairDelegate" ,
172
+ " ()Lchip/devicecontroller/KeypairDelegate;" , &getKeypairDelegate);
173
+ SuccessOrExit (err);
175
174
176
175
jmethodID getRootCertificate;
177
- err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getRootCertificate" , PARAMS_CLASS,
178
- &getRootCertificate );
176
+ err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getRootCertificate" , " ()[B " , &getRootCertificate);
177
+ SuccessOrExit (err );
179
178
180
179
jmethodID getIntermediateCertificate;
181
- err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getIntermediateCertificate" , PARAMS_CLASS ,
180
+ err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getIntermediateCertificate" , " ()[B " ,
182
181
&getIntermediateCertificate);
182
+ SuccessOrExit (err);
183
183
184
184
jmethodID getOperationalCertificate;
185
- err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getOperationalCertificate" , PARAMS_CLASS ,
185
+ err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getOperationalCertificate" , " ()[B " ,
186
186
&getOperationalCertificate);
187
+ SuccessOrExit (err);
187
188
188
189
jmethodID getIpk;
189
- err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getIpk" , PARAMS_CLASS, &getIpk);
190
+ err = chip::JniReferences::GetInstance ().FindMethod (env, controllerParams, " getIpk" , " ()[B" , &getIpk);
191
+ SuccessOrExit (err);
190
192
191
193
{
192
194
uint16_t listenPort = env->CallIntMethod (controllerParams, getUdpListenPort);
0 commit comments