[android] disconnect device before a new connection is made (project-…

…chip#4896)
mspang · Feb 17, 2021 · 1e136a1 · 1e136a1
1 parent fbc9596
commit 1e136a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 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
@@ -98,6 +98,7 @@ class DeviceProvisioningFragment : Fragment() {
 
       showMessage(R.string.rendezvous_over_ble_pairing_text)
       deviceController.setCompletionListener(ConnectionCallback())
+      deviceController.disconnectDevice();
       deviceController.beginConnectDeviceBle(gatt, deviceInfo.setupPinCode);
     }
   }

diff --git a/src/controller/CHIPDeviceController_deprecated.cpp b/src/controller/CHIPDeviceController_deprecated.cpp
@@ -176,8 +176,7 @@ bool ChipDeviceController::GetIpAddress(Inet::IPAddress & addr)
     if (!IsConnected())
         return false;
 
-    if (mDevice == nullptr)
-        InitDevice();
+    InitDevice();
 
     return mDevice != nullptr && mDevice->GetIpAddress(addr);
 }
@@ -206,10 +205,7 @@ CHIP_ERROR ChipDeviceController::SendMessage(void * appReqState, PacketBufferHan
     }
     VerifyOrExit(mRemoteDeviceId != kUndefinedNodeId, err = CHIP_ERROR_INCORRECT_STATE);
 
-    if (mDevice == nullptr)
-    {
-        SuccessOrExit(InitDevice());
-    }
+    SuccessOrExit(InitDevice());
 
     VerifyOrExit(mDevice != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
     mDevice->SetDelegate(this);