Address review comments

project-chip · Feb 3, 2023 · e0acfbc · e0acfbc
1 parent 59b4850
commit e0acfbc
Showing 1 changed file with 50 additions and 49 deletions.
diff --git a/...ool/app/src/main/java/com/google/chip/chiptool/provisioning/DeviceProvisioningFragment.kt b/...ool/app/src/main/java/com/google/chip/chiptool/provisioning/DeviceProvisioningFragment.kt
@@ -90,35 +90,36 @@ class DeviceProvisioningFragment : Fragment() {
     DeviceIdUtil.setNextAvailableId(requireContext(), id + 1)
     deviceController.setCompletionListener(ConnectionCallback())
 
-    deviceController.setDeviceAttestationDelegate(DEVICE_ATTESTATION_FAILED_TIMEOUT,
-    { devicePtr, attestationInfo, errorCode ->
+    deviceController.setDeviceAttestationDelegate(DEVICE_ATTESTATION_FAILED_TIMEOUT
+    ) { devicePtr, attestationInfo, errorCode ->
       Log.i(TAG, "Device attestation errorCode: $errorCode, " +
               "Look at 'src/credentials/attestation_verifier/DeviceAttestationVerifier.h' " +
               "AttestationVerificationResult enum to understand the errors")
 
-      if (errorCode != STATUS_PAIRING_SUCCESS) {
-        requireActivity().runOnUiThread(Runnable {
-          val alertDialog: AlertDialog? = activity?.let {
-            val builder = AlertDialog.Builder(it)
-            builder.apply {
-              setPositiveButton("Continue",
-                DialogInterface.OnClickListener { dialog, id ->
-                  deviceController.continueCommissioning(devicePtr, true)
-                })
-              setNegativeButton("No",
-                DialogInterface.OnClickListener { dialog, id ->
-                  deviceController.continueCommissioning(devicePtr, false)
-                })
-            }
-            builder.setTitle("Device Attestation")
-            builder.setMessage("Device Attestation failed for device under commissioning. Do you wish to continue pairing?")
-            // Create the AlertDialog
-            builder.create()
+      if (errorCode != STATUS_PAIRING_SUCCESS)
+        return@setDeviceAttestationDelegate
+
+      requireActivity().runOnUiThread(Runnable {
+        val alertDialog: AlertDialog? = activity?.let {
+          val builder = AlertDialog.Builder(it)
+          builder.apply {
+            setPositiveButton("Continue",
+              DialogInterface.OnClickListener { dialog, id ->
+                deviceController.continueCommissioning(devicePtr, true)
+              })
+            setNegativeButton("No",
+              DialogInterface.OnClickListener { dialog, id ->
+                deviceController.continueCommissioning(devicePtr, false)
+              })
           }
-          alertDialog?.show()
-        })
-      }
-    })
+          builder.setTitle("Device Attestation")
+          builder.setMessage("Device Attestation failed for device under commissioning. Do you wish to continue pairing?")
+          // Create the AlertDialog
+          builder.create()
+        }
+        alertDialog?.show()
+      })      
+    }
 
     deviceController.pairDeviceWithAddress(
       id,
@@ -134,7 +135,6 @@ class DeviceProvisioningFragment : Fragment() {
     if (gatt != null) {
       return
     }
-    Log.i(TAG, "yujuan:startConnectingToDevice")
     scope.launch {
       val deviceController = ChipClient.getDeviceController(requireContext())
       val bluetoothManager = BluetoothManager()
@@ -172,35 +172,36 @@ class DeviceProvisioningFragment : Fragment() {
         network = NetworkCredentials.forThread(NetworkCredentials.ThreadCredentials(thread.operationalDataset))
       }
 
-      deviceController.setDeviceAttestationDelegate(DEVICE_ATTESTATION_FAILED_TIMEOUT,
-      { devicePtr, attestationInfo, errorCode ->
+      deviceController.setDeviceAttestationDelegate(DEVICE_ATTESTATION_FAILED_TIMEOUT
+      ) { devicePtr, attestationInfo, errorCode ->
         Log.i(TAG, "Device attestation errorCode: $errorCode, " +
                 "Look at 'src/credentials/attestation_verifier/DeviceAttestationVerifier.h' " +
                 "AttestationVerificationResult enum to understand the errors")
 
-        if (errorCode != STATUS_PAIRING_SUCCESS) {
-          requireActivity().runOnUiThread(Runnable {
-            val alertDialog: AlertDialog? = activity?.let {
-              val builder = AlertDialog.Builder(it)
-              builder.apply {
-                setPositiveButton("Continue",
-                  DialogInterface.OnClickListener { dialog, id ->
-                    deviceController.continueCommissioning(devicePtr, true)
-                  })
-                setNegativeButton("No",
-                  DialogInterface.OnClickListener { dialog, id ->
-                    deviceController.continueCommissioning(devicePtr, false)
-                  })
-              }
-              builder.setTitle("Device Attestation")
-              builder.setMessage("Device Attestation failed for device under commissioning. Do you wish to continue pairing?")
-              // Create the AlertDialog
-              builder.create()
+        if (errorCode != STATUS_PAIRING_SUCCESS)
+          return@setDeviceAttestationDelegate
+
+        requireActivity().runOnUiThread(Runnable {
+          val alertDialog: AlertDialog? = activity?.let {
+            val builder = AlertDialog.Builder(it)
+            builder.apply {
+              setPositiveButton("Continue",
+                DialogInterface.OnClickListener { dialog, id ->
+                  deviceController.continueCommissioning(devicePtr, true)
+                })
+              setNegativeButton("No",
+                DialogInterface.OnClickListener { dialog, id ->
+                  deviceController.continueCommissioning(devicePtr, false)
+                })
             }
-            alertDialog?.show()
-          })
-        }
-      })
+            builder.setTitle("Device Attestation")
+            builder.setMessage("Device Attestation failed for device under commissioning. Do you wish to continue pairing?")
+            // Create the AlertDialog
+            builder.create()
+          }
+          alertDialog?.show()
+        })
+      }
 
       deviceController.pairDevice(gatt, connId, deviceId, deviceInfo.setupPinCode, network)
       DeviceIdUtil.setNextAvailableId(requireContext(), deviceId + 1)