resolve comments

project-chip · Nov 4, 2021 · d419b40 · d419b40
1 parent ce554f8
commit d419b40
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 28 deletions.
diff --git a/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml b/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
diff --git a/...n/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt b/...n/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
@@ -62,8 +62,8 @@ class ClusterDetailFragment : Fragment() {
     savedInstanceState: Bundle?
   ): View {
     clusterMap = ClusterInfoMapping().clusterMap
-    devicePtr = checkNotNull(requireArguments().getLong(DEVICE_PTR))
-    endpointId = checkNotNull(requireArguments().getInt(ENDPOINT_ID))
+    devicePtr = checkNotNull(requireArguments().getLong(DEVICE_PTR_KEY))
+    endpointId = checkNotNull(requireArguments().getInt(ENDPOINT_ID_KEY))
     return inflater.inflate(R.layout.cluster_detail_fragment, container, false).apply {
       deviceController.setCompletionListener(GenericChipDeviceListener())
       commandAutoCompleteTv.visibility = View.GONE
@@ -189,11 +189,7 @@ class ClusterDetailFragment : Fragment() {
   }
 
   private fun constructHint(clusterMap: Map<String, *>): Array<String> {
-    val clusterName = mutableListOf<String>()
-    for ((name, info) in clusterMap) {
-      clusterName.add(name)
-    }
-    return clusterName.toTypedArray()
+    return clusterMap.keys.toTypedArray()
   }
 
   override fun onStop() {
@@ -203,16 +199,17 @@ class ClusterDetailFragment : Fragment() {
 
   companion object {
     private const val TAG = "ClusterDetailFragment"
-    private const val ENDPOINT_ID = "endpoint_id"
-    private const val DEVICE_PTR = "device_ptr"
+    private const val ENDPOINT_ID_KEY = "endpoint_id"
+    private const val DEVICE_PTR_KEY = "device_ptr"
+
     fun newInstance(
       deviceId: Long,
       endpointId: Int
     ): ClusterDetailFragment {
       return ClusterDetailFragment().apply {
         arguments = Bundle(2).apply {
-          putLong(DEVICE_PTR, deviceId)
-          putInt(ENDPOINT_ID, endpointId)
+          putLong(DEVICE_PTR_KEY, deviceId)
+          putInt(ENDPOINT_ID_KEY, endpointId)
         }
       }
     }