Implement remove ICD Client Info in Android platform

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

@@ -8,11 +8,13 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import chip.devicecontroller.ChipDeviceController
+import chip.devicecontroller.ChipICDClient
 import chip.devicecontroller.UnpairDeviceCallback
 import com.google.chip.chiptool.ChipClient
 import com.google.chip.chiptool.R
 import com.google.chip.chiptool.clusterclient.AddressUpdateFragment
 import com.google.chip.chiptool.databinding.UnpairDeviceFragmentBinding
+import com.google.chip.chiptool.util.DeviceIdUtil
 import kotlinx.coroutines.*
 
 class UnpairDeviceFragment : Fragment() {
@@ -63,6 +65,21 @@ class UnpairDeviceFragment : Fragment() {
       addressUpdateFragment.deviceId,
       ChipUnpairDeviceCallback()
     )
+
+    // Remove ICD Client info
+    if (addressUpdateFragment.isICDDevice()) {
+      ChipICDClient.removeICDClientInfo(
+        deviceController.fabricIndex,
+        addressUpdateFragment.deviceId
+      )
+
+      Log.d(TAG, "ICDClientInfo : ${ChipICDClient.getICDClientInfo(deviceController.fabricIndex)}")
+    }
+    requireActivity().runOnUiThread {
+      Log.d(TAG, "remove : ${addressUpdateFragment.deviceId}")
+      DeviceIdUtil.removeCommissionedNodeId(requireContext(), addressUpdateFragment.deviceId)
+      addressUpdateFragment.updateDeviceIdSpinner()
+    }
   }
 
   companion object {

src/controller/java/AndroidICDClient.cpp

@@ -93,6 +93,19 @@ jobject getICDClientInfo(JNIEnv * env, const char * icdClientInfoSign, jint jFab
     return jInfo;
 }
 
+jlong removeICDClientInfo(JNIEnv * env, jint jFabricIndex, jlong jNodeId)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    chip::ScopedNodeId scopedNodeId(static_cast<chip::NodeId>(jNodeId), static_cast<chip::FabricIndex>(jFabricIndex));
+    err = getICDClientStorage()->DeleteEntry(scopedNodeId);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Controller, "removeICDClientInfo error!: %" CHIP_ERROR_FORMAT, err.Format());
+    }
+    return static_cast<jlong>(err.AsInteger());
+}
+
 chip::app::DefaultICDClientStorage * getICDClientStorage()
 {
     return &sICDClientStorage;

src/controller/java/AndroidICDClient.h

@@ -29,4 +29,6 @@
 
 jobject getICDClientInfo(JNIEnv * env, const char * icdClientInfoSign, jint jFabricIndex);
 
+jlong removeICDClientInfo(JNIEnv * env, jint jFabricIndex, jlong jNodeId);
+
 chip::app::DefaultICDClientStorage * getICDClientStorage();

src/controller/java/CHIPICDClient-JNI.cpp

@@ -27,3 +27,9 @@ JNI_METHOD(jobject, getICDClientInfo)(JNIEnv * env, jobject self, jint jFabricIn
 
     return getICDClientInfo(env, "chip/devicecontroller/ICDClientInfo", jFabricIndex);
 }
+
+JNI_METHOD(void, removeICDClientInfo)(JNIEnv * env, jobject self, jint jFabricIndex, jlong jNodeId)
+{
+    chip::DeviceLayer::StackLock lock;
+    removeICDClientInfo(env, jFabricIndex, jNodeId);
+}

src/controller/java/MatterICDClient-JNI.cpp

@@ -27,3 +27,9 @@ JNI_METHOD(jobject, getICDClientInfo)(JNIEnv * env, jobject self, jint jFabricIn
 
     return getICDClientInfo(env, "matter/controller/ICDClientInfo", jFabricIndex);
 }
+
+JNI_METHOD(void, removeICDClientInfo)(JNIEnv * env, jobject self, jint jFabricIndex, jlong jNodeId)
+{
+    chip::DeviceLayer::StackLock lock;
+    removeICDClientInfo(env, jFabricIndex, jNodeId);
+}

src/controller/java/src/chip/devicecontroller/ChipICDClient.java

@@ -30,5 +30,7 @@ public static boolean isPeerICDClient(int fabricIndex, long deviceId) {
     return clientInfo.stream().anyMatch(info -> info.getPeerNodeId() == deviceId);
   }
 
+  public static native void removeICDClientInfo(int fabricIndex, long deviceId);
+
   public static native List<ICDClientInfo> getICDClientInfo(int fabricIndex);
 }

src/controller/java/src/matter/controller/MatterICDClientImpl.kt

@@ -25,4 +25,6 @@ object MatterICDClientImpl {
   }
 
   external fun getICDClientInfo(fabricIndex: Int): List<ICDClientInfo>?
+
+  external fun removeICDClientInfo(fabricIndex: Int, deviceId: Long)
 }