Skip to content

Commit 6290f8e

Browse files
yunhanw-googleyunhanw-google
committed
[Android]CHIP_ERROR should be handled by Long in Java/Kotlin
1 parent 04251f1 commit 6290f8e

File tree

13 files changed

+93
-68
lines changed

13 files changed

+93
-68
lines changed

‎examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/GenericChipDeviceListener.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ open class GenericChipDeviceListener : ChipDeviceController.CompletionListener {
1212
// No op
1313
}
1414

15-
override fun onPairingComplete(code: Int) {
15+
override fun onPairingComplete(code: Long) {
1616
// No op
1717
}
1818

19-
override fun onPairingDeleted(code: Int) {
19+
override fun onPairingDeleted(code: Long) {
2020
// No op
2121
}
2222

23-
override fun onCommissioningComplete(nodeId: Long, errorCode: Int) {
23+
override fun onCommissioningComplete(nodeId: Long, errorCode: Long) {
2424
// No op
2525
}
2626

@@ -33,7 +33,7 @@ open class GenericChipDeviceListener : ChipDeviceController.CompletionListener {
3333
// No op
3434
}
3535

36-
override fun onCommissioningStatusUpdate(nodeId: Long, stage: String, errorCode: Int) {
36+
override fun onCommissioningStatusUpdate(nodeId: Long, stage: String, errorCode: Long) {
3737
// No op
3838
}
3939

@@ -57,7 +57,7 @@ open class GenericChipDeviceListener : ChipDeviceController.CompletionListener {
5757
// No op
5858
}
5959

60-
override fun onICDRegistrationComplete(errorCode: Int, icdDeviceInfo: ICDDeviceInfo) {
60+
override fun onICDRegistrationComplete(errorCode: Long, icdDeviceInfo: ICDDeviceInfo) {
6161
// No op
6262
}
6363
}

‎examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/DeviceProvisioningFragment.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ class DeviceProvisioningFragment : Fragment() {
249249
Log.d(TAG, "Pairing status update: $status")
250250
}
251251

252-
override fun onCommissioningComplete(nodeId: Long, errorCode: Int) {
252+
override fun onCommissioningComplete(nodeId: Long, errorCode: Long) {
253253
if (errorCode == STATUS_PAIRING_SUCCESS) {
254254
FragmentUtil.getHost(this@DeviceProvisioningFragment, Callback::class.java)
255255
?.onCommissioningComplete(0, nodeId)
@@ -260,7 +260,7 @@ class DeviceProvisioningFragment : Fragment() {
260260
}
261261
}
262262

263-
override fun onPairingComplete(code: Int) {
263+
override fun onPairingComplete(code: Long) {
264264
Log.d(TAG, "onPairingComplete: $code")
265265

266266
if (code != STATUS_PAIRING_SUCCESS) {
@@ -274,7 +274,7 @@ class DeviceProvisioningFragment : Fragment() {
274274
Log.d(TAG, String(csr))
275275
}
276276

277-
override fun onPairingDeleted(code: Int) {
277+
override fun onPairingDeleted(code: Long) {
278278
Log.d(TAG, "onPairingDeleted: $code")
279279
}
280280

@@ -293,7 +293,7 @@ class DeviceProvisioningFragment : Fragment() {
293293
)
294294
}
295295

296-
override fun onICDRegistrationComplete(errorCode: Int, icdDeviceInfo: ICDDeviceInfo) {
296+
override fun onICDRegistrationComplete(errorCode: Long, icdDeviceInfo: ICDDeviceInfo) {
297297
Log.d(
298298
TAG,
299299
"onICDRegistrationComplete - errorCode: $errorCode, symmetricKey : ${icdDeviceInfo.symmetricKey.toHex()}, icdDeviceInfo : $icdDeviceInfo"

‎examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairAddressPaseCommand.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ class PairAddressPaseCommand(controller: ChipDeviceController, credsIssue: Crede
3030
PairingModeType.ADDRESS_PASE_ONLY,
3131
PairingNetworkType.NONE
3232
) {
33-
override fun onPairingComplete(errorCode: Int) {
33+
override fun onPairingComplete(errorCode: Long) {
3434
logger.log(Level.INFO, "onPairingComplete with error code: $errorCode")
35-
if (errorCode == 0) {
35+
if (errorCode == 0L) {
3636
setSuccess()
3737
} else {
3838
setFailure("onPairingComplete failure")

‎examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,20 @@ abstract class PairingCommand(
127127
logger.log(Level.INFO, "onStatusUpdate with status: $status")
128128
}
129129

130-
override fun onPairingComplete(errorCode: Int) {
130+
override fun onPairingComplete(errorCode: Long) {
131131
logger.log(Level.INFO, "onPairingComplete with error code: $errorCode")
132-
if (errorCode != 0) {
132+
if (errorCode != 0L) {
133133
setFailure("onPairingComplete failure")
134134
}
135135
}
136136

137-
override fun onPairingDeleted(errorCode: Int) {
137+
override fun onPairingDeleted(errorCode: Long) {
138138
logger.log(Level.INFO, "onPairingDeleted with error code: $errorCode")
139139
}
140140

141-
override fun onCommissioningComplete(nodeId: Long, errorCode: Int) {
141+
override fun onCommissioningComplete(nodeId: Long, errorCode: Long) {
142142
logger.log(Level.INFO, "onCommissioningComplete with error code: $errorCode")
143-
if (errorCode == 0) {
143+
if (errorCode == 0L) {
144144
setSuccess()
145145
} else {
146146
setFailure("onCommissioningComplete failure")
@@ -156,7 +156,7 @@ abstract class PairingCommand(
156156
logger.log(Level.INFO, "onReadCommissioningInfo")
157157
}
158158

159-
override fun onCommissioningStatusUpdate(nodeId: Long, stage: String?, errorCode: Int) {
159+
override fun onCommissioningStatusUpdate(nodeId: Long, stage: String?, errorCode: Long) {
160160
logger.log(Level.INFO, "onCommissioningStatusUpdate")
161161
}
162162

@@ -186,7 +186,7 @@ abstract class PairingCommand(
186186
.updateCommissioningICDRegistrationInfo(ICDRegistrationInfo.newBuilder().build())
187187
}
188188

189-
override fun onICDRegistrationComplete(errorCode: Int, icdDeviceInfo: ICDDeviceInfo) {
189+
override fun onICDRegistrationComplete(errorCode: Long, icdDeviceInfo: ICDDeviceInfo) {
190190
logger.log(
191191
Level.INFO,
192192
"onICDRegistrationComplete with errorCode: $errorCode, symmetricKey: ${icdDeviceInfo.symmetricKey.toHex()}, icdDeviceInfo: $icdDeviceInfo"

‎examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,20 @@ abstract class PairingCommand(
125125
logger.log(Level.INFO, "onStatusUpdate with status: $status")
126126
}
127127

128-
override fun onPairingComplete(errorCode: Int) {
128+
override fun onPairingComplete(errorCode: Long) {
129129
logger.log(Level.INFO, "onPairingComplete with error code: $errorCode")
130-
if (errorCode != 0) {
130+
if (errorCode != 0L) {
131131
setFailure("onPairingComplete failure")
132132
}
133133
}
134134

135-
override fun onPairingDeleted(errorCode: Int) {
135+
override fun onPairingDeleted(errorCode: Long) {
136136
logger.log(Level.INFO, "onPairingDeleted with error code: $errorCode")
137137
}
138138

139-
override fun onCommissioningComplete(nodeId: Long, errorCode: Int) {
139+
override fun onCommissioningComplete(nodeId: Long, errorCode: Long) {
140140
logger.log(Level.INFO, "onCommissioningComplete with error code: $errorCode")
141-
if (errorCode == 0) {
141+
if (errorCode == 0L) {
142142
setSuccess()
143143
} else {
144144
setFailure("onCommissioningComplete failure")
@@ -154,7 +154,7 @@ abstract class PairingCommand(
154154
logger.log(Level.INFO, "onReadCommissioningInfo")
155155
}
156156

157-
override fun onCommissioningStatusUpdate(nodeId: Long, stage: String?, errorCode: Int) {
157+
override fun onCommissioningStatusUpdate(nodeId: Long, stage: String?, errorCode: Long) {
158158
logger.log(Level.INFO, "onCommissioningStatusUpdate")
159159
}
160160

@@ -178,7 +178,7 @@ abstract class PairingCommand(
178178
logger.log(Level.INFO, "onICDRegistrationInfoRequired")
179179
}
180180

181-
override fun onICDRegistrationComplete(errorCode: Int, icdDeviceInfo: ICDDeviceInfo) {
181+
override fun onICDRegistrationComplete(errorCode: Long, icdDeviceInfo: ICDDeviceInfo) {
182182
logger.log(
183183
Level.INFO,
184184
"onICDRegistrationComplete with errorCode: $errorCode, symmetricKey: ${icdDeviceInfo.symmetricKey.toHex()}, icdDeviceInfo: $icdDeviceInfo"

‎src/controller/java/AndroidDeviceControllerWrapper.cpp

+21-15
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,18 @@ void AndroidDeviceControllerWrapper::SetJavaObjectRef(JavaVM * vm, jobject obj)
8686
}
8787
}
8888

89-
void AndroidDeviceControllerWrapper::CallJavaMethod(const char * methodName, jint argument)
89+
void AndroidDeviceControllerWrapper::CallJavaIntMethod(const char * methodName, jint argument)
9090
{
9191
JniReferences::GetInstance().CallVoidInt(JniReferences::GetInstance().GetEnvForCurrentThread(), mJavaObjectRef.ObjectRef(),
9292
methodName, argument);
9393
}
9494

95+
void AndroidDeviceControllerWrapper::CallJavaLongMethod(const char * methodName, jlong argument)
96+
{
97+
JniReferences::GetInstance().CallVoidLong(JniReferences::GetInstance().GetEnvForCurrentThread(), mJavaObjectRef.ObjectRef(),
98+
methodName, argument);
99+
}
100+
95101
AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(
96102
JavaVM * vm, jobject deviceControllerObj, chip::NodeId nodeId, chip::FabricId fabricId, const chip::CATValues & cats,
97103
chip::System::Layer * systemLayer, chip::Inet::EndPointManager<Inet::TCPEndPoint> * tcpEndPointManager,
@@ -697,19 +703,19 @@ CHIP_ERROR AndroidDeviceControllerWrapper::SetICDCheckInDelegate(jobject checkIn
697703
void AndroidDeviceControllerWrapper::OnStatusUpdate(chip::Controller::DevicePairingDelegate::Status status)
698704
{
699705
chip::DeviceLayer::StackUnlock unlock;
700-
CallJavaMethod("onStatusUpdate", static_cast<jint>(status));
706+
CallJavaIntMethod("onStatusUpdate", static_cast<jint>(status));
701707
}
702708

703709
void AndroidDeviceControllerWrapper::OnPairingComplete(CHIP_ERROR error)
704710
{
705711
chip::DeviceLayer::StackUnlock unlock;
706-
CallJavaMethod("onPairingComplete", static_cast<jint>(error.AsInteger()));
712+
CallJavaLongMethod("onPairingComplete", static_cast<jlong>(error.AsInteger()));
707713
}
708714

709715
void AndroidDeviceControllerWrapper::OnPairingDeleted(CHIP_ERROR error)
710716
{
711717
chip::DeviceLayer::StackUnlock unlock;
712-
CallJavaMethod("onPairingDeleted", static_cast<jint>(error.AsInteger()));
718+
CallJavaLongMethod("onPairingDeleted", static_cast<jlong>(error.AsInteger()));
713719
}
714720

715721
void AndroidDeviceControllerWrapper::OnCommissioningComplete(NodeId deviceId, CHIP_ERROR error)
@@ -727,11 +733,11 @@ void AndroidDeviceControllerWrapper::OnCommissioningComplete(NodeId deviceId, CH
727733

728734
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
729735
jmethodID onCommissioningCompleteMethod;
730-
CHIP_ERROR err = JniReferences::GetInstance().FindMethod(env, mJavaObjectRef.ObjectRef(), "onCommissioningComplete", "(JI)V",
736+
CHIP_ERROR err = JniReferences::GetInstance().FindMethod(env, mJavaObjectRef.ObjectRef(), "onCommissioningComplete", "(JJ)V",
731737
&onCommissioningCompleteMethod);
732738
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Error finding Java method: %" CHIP_ERROR_FORMAT, err.Format()));
733739
env->CallVoidMethod(mJavaObjectRef.ObjectRef(), onCommissioningCompleteMethod, static_cast<jlong>(deviceId),
734-
static_cast<jint>(error.AsInteger()));
740+
static_cast<jlong>(error.AsInteger()));
735741

736742
if (ssidStr != nullptr)
737743
{
@@ -762,12 +768,12 @@ void AndroidDeviceControllerWrapper::OnCommissioningStatusUpdate(PeerId peerId,
762768
JniLocalReferenceScope scope(env);
763769
jmethodID onCommissioningStatusUpdateMethod;
764770
CHIP_ERROR err = JniReferences::GetInstance().FindMethod(env, mJavaObjectRef.ObjectRef(), "onCommissioningStatusUpdate",
765-
"(JLjava/lang/String;I)V", &onCommissioningStatusUpdateMethod);
771+
"(JLjava/lang/String;J)V", &onCommissioningStatusUpdateMethod);
766772
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Error finding Java method: %" CHIP_ERROR_FORMAT, err.Format()));
767773

768774
UtfString jStageCompleted(env, StageToString(stageCompleted));
769775
env->CallVoidMethod(mJavaObjectRef.ObjectRef(), onCommissioningStatusUpdateMethod, static_cast<jlong>(peerId.GetNodeId()),
770-
jStageCompleted.jniValue(), static_cast<jint>(error.AsInteger()));
776+
jStageCompleted.jniValue(), static_cast<jlong>(error.AsInteger()));
771777
}
772778

773779
void AndroidDeviceControllerWrapper::OnReadCommissioningInfo(const chip::Controller::ReadCommissioningInfo & info)
@@ -800,12 +806,12 @@ void AndroidDeviceControllerWrapper::OnScanNetworksSuccess(
800806
VerifyOrReturn(env != nullptr, ChipLogError(Controller, "Could not get JNIEnv for current thread"));
801807
JniLocalReferenceScope scope(env);
802808

803-
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv"));
809+
VerifyOrReturn(env != nullptr, ChipLogError(Controller, "Error invoking Java callback: no JNIEnv"));
804810

805811
err = JniReferences::GetInstance().FindMethod(
806812
env, mJavaObjectRef.ObjectRef(), "onScanNetworksSuccess",
807813
"(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
808-
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
814+
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Error invoking Java callback: %s", ErrorStr(err)));
809815

810816
jobject NetworkingStatus;
811817
std::string NetworkingStatusClassName = "java/lang/Integer";
@@ -937,7 +943,7 @@ void AndroidDeviceControllerWrapper::OnScanNetworksSuccess(
937943
threadInterfaceScanResultStructClass);
938944
if (err != CHIP_NO_ERROR)
939945
{
940-
ChipLogError(Zcl, "Could not find class ThreadScanResult");
946+
ChipLogError(Controller, "Could not find class ThreadScanResult");
941947
return;
942948
}
943949
jmethodID threadInterfaceScanResultStructCtor =
@@ -946,7 +952,7 @@ void AndroidDeviceControllerWrapper::OnScanNetworksSuccess(
946952
"Integer;[BLjava/lang/Integer;Ljava/lang/Integer;)V");
947953
if (threadInterfaceScanResultStructCtor == nullptr)
948954
{
949-
ChipLogError(Zcl, "Could not find ThreadScanResult constructor");
955+
ChipLogError(Controller, "Could not find ThreadScanResult constructor");
950956
return;
951957
}
952958

@@ -966,7 +972,7 @@ void AndroidDeviceControllerWrapper::OnScanNetworksFailure(CHIP_ERROR error)
966972
{
967973
chip::DeviceLayer::StackUnlock unlock;
968974

969-
CallJavaMethod("onScanNetworksFailure", static_cast<jint>(error.AsInteger()));
975+
CallJavaLongMethod("onScanNetworksFailure", static_cast<jlong>(error.AsInteger()));
970976
}
971977

972978
void AndroidDeviceControllerWrapper::OnICDRegistrationInfoRequired()
@@ -1022,7 +1028,7 @@ void AndroidDeviceControllerWrapper::OnICDRegistrationComplete(chip::NodeId icdN
10221028
jbyteArray jSymmetricKey = nullptr;
10231029
CHIP_ERROR methodErr =
10241030
JniReferences::GetInstance().FindMethod(env, mJavaObjectRef.ObjectRef(), "onICDRegistrationComplete",
1025-
"(ILchip/devicecontroller/ICDDeviceInfo;)V", &onICDRegistrationCompleteMethod);
1031+
"(JLchip/devicecontroller/ICDDeviceInfo;)V", &onICDRegistrationCompleteMethod);
10261032
VerifyOrReturn(methodErr == CHIP_NO_ERROR,
10271033
ChipLogError(Controller, "Error finding Java method: %" CHIP_ERROR_FORMAT, methodErr.Format()));
10281034

@@ -1045,7 +1051,7 @@ void AndroidDeviceControllerWrapper::OnICDRegistrationComplete(chip::NodeId icdN
10451051
static_cast<jlong>(mAutoCommissioner.GetCommissioningParameters().GetICDMonitoredSubject().Value()),
10461052
static_cast<jlong>(Controller()->GetFabricId()), static_cast<jint>(Controller()->GetFabricIndex()));
10471053

1048-
env->CallVoidMethod(mJavaObjectRef.ObjectRef(), onICDRegistrationCompleteMethod, static_cast<jint>(err.AsInteger()),
1054+
env->CallVoidMethod(mJavaObjectRef.ObjectRef(), onICDRegistrationCompleteMethod, static_cast<jlong>(err.AsInteger()),
10491055
icdDeviceInfoObj);
10501056
}
10511057

‎src/controller/java/AndroidDeviceControllerWrapper.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel
8686
}
8787
#endif // JAVA_MATTER_CONTROLLER_TEST
8888

89-
void CallJavaMethod(const char * methodName, jint argument);
89+
void CallJavaIntMethod(const char * methodName, jint argument);
90+
void CallJavaLongMethod(const char * methodName, jlong argument);
9091
CHIP_ERROR InitializeOperationalCredentialsIssuer();
9192

9293
/**

‎src/controller/java/CHIPDeviceController-JNI.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void JNI_OnUnload(JavaVM * jvm, void * reserved)
161161
chip::Platform::MemoryShutdown();
162162
}
163163

164-
JNI_METHOD(jint, onNOCChainGeneration)
164+
JNI_METHOD(jlong, onNOCChainGeneration)
165165
(JNIEnv * env, jobject self, jlong handle, jobject controllerParams)
166166
{
167167
chip::DeviceLayer::StackLock lock;
@@ -266,15 +266,15 @@ JNI_METHOD(jint, onNOCChainGeneration)
266266
{
267267
ChipLogError(Controller, "Failed to SetNocChain for the device: %" CHIP_ERROR_FORMAT, err.Format());
268268
}
269-
return static_cast<jint>(err.AsInteger());
269+
return static_cast<jlong>(err.AsInteger());
270270
#endif // JAVA_MATTER_CONTROLLER_TEST
271271
}
272272
exit:
273273
#ifndef JAVA_MATTER_CONTROLLER_TEST
274274
err = wrapper->GetAndroidOperationalCredentialsIssuer()->NOCChainGenerated(err, ByteSpan(), ByteSpan(), ByteSpan(), ipkOptional,
275275
adminSubjectOptional);
276276
#endif // JAVA_MATTER_CONTROLLER_TEST
277-
return static_cast<jint>(err.AsInteger());
277+
return static_cast<jlong>(err.AsInteger());
278278
}
279279

280280
JNI_METHOD(jlong, newDeviceController)(JNIEnv * env, jobject self, jobject controllerParams)

0 commit comments

Comments
 (0)