[Android] Fix crash when read/subscribe attribute API (#23377)

* Fix crash when read API in Android * Modify subscribe dialog UI * Restyle
project-chip · Jul 21, 2023 · 2784260 · 2784260
1 parent f10fbf4
commit 2784260
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/subscribe_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/subscribe_dialog.xml
@@ -33,8 +33,7 @@
       android:textSize="16sp"
       android:layout_marginBottom="8dp"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/minIntervalEd"
-      app:layout_constraintBottom_toTopOf="@+id/subscribeBtn"/>
+      app:layout_constraintTop_toBottomOf="@id/minIntervalEd" />
 
   <EditText
       android:id="@+id/keepSubscriptionsEd"
@@ -45,8 +44,7 @@
       android:textSize="16sp"
       android:layout_marginBottom="8dp"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/keepSubscriptionsEd"
-      app:layout_constraintBottom_toTopOf="@+id/subscribeBtn"/>
+      app:layout_constraintTop_toBottomOf="@id/maxIntervalEd" />
 
   <EditText
       android:id="@+id/isFabricFilteredEd"
@@ -57,7 +55,7 @@
       android:textSize="16sp"
       android:layout_marginBottom="8dp"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/isFabricFilteredEd"
+      app:layout_constraintTop_toBottomOf="@id/keepSubscriptionsEd"
       app:layout_constraintBottom_toTopOf="@+id/subscribeBtn"/>
 
   <Button

diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -1149,6 +1149,8 @@ JNI_METHOD(void, read)
     err = ParseEventPathList(eventPathList, eventPathParamsList);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Error parsing Java event paths: %s", ErrorStr(err)));
 
+    VerifyOrReturn(attributePathParamsList.size() != 0 || eventPathParamsList.size() != 0,
+                   ChipLogError(Controller, "Error parsing Java both event paths and attribute paths"));
     app::ReadPrepareParams params(device->GetSecureSession().Value());
     params.mpAttributePathParamsList    = attributePathParamsList.data();
     params.mAttributePathParamsListSize = attributePathParamsList.size();
@@ -1182,6 +1184,12 @@ JNI_METHOD(void, read)
 CHIP_ERROR ParseAttributePathList(jobject attributePathList, std::vector<app::AttributePathParams> & outAttributePathParamsList)
 {
     jint listSize;
+
+    if (attributePathList == nullptr)
+    {
+        return CHIP_NO_ERROR;
+    }
+
     ReturnErrorOnFailure(JniReferences::GetInstance().GetListSize(attributePathList, listSize));
 
     for (uint8_t i = 0; i < listSize; i++)
@@ -1241,6 +1249,12 @@ CHIP_ERROR ParseAttributePath(jobject attributePath, EndpointId & outEndpointId,
 CHIP_ERROR ParseEventPathList(jobject eventPathList, std::vector<app::EventPathParams> & outEventPathParamsList)
 {
     jint listSize;
+
+    if (eventPathList == nullptr)
+    {
+        return CHIP_NO_ERROR;
+    }
+
     ReturnErrorOnFailure(JniReferences::GetInstance().GetListSize(eventPathList, listSize));
 
     for (uint8_t i = 0; i < listSize; i++)