Bluetooth: notify user of incoming pairing requests

device/bluetooth/bluetooth_pairing_chromeos.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/bluetooth_pairing_chromeos.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_device_chromeos.h"
@@ skipping 56 matching lines @@
 
   pairing_delegate_ = NULL;
 }
 
 void BluetoothPairingChromeOS::RequestPinCode(
     const BluetoothAgentServiceProvider::Delegate::PinCodeCallback& callback) {
   UMA_HISTOGRAM_ENUMERATION("Bluetooth.PairingMethod",
                             UMA_PAIRING_METHOD_REQUEST_PINCODE,
                             UMA_PAIRING_METHOD_COUNT);
 
-  DCHECK(pincode_callback_.is_null());
+  ResetCallbacks();
   pincode_callback_ = callback;
+  pairing_delegate_used_ = true;
   pairing_delegate_->RequestPinCode(device_);
-  pairing_delegate_used_ = true;
 }
 
 bool BluetoothPairingChromeOS::ExpectingPinCode() const {
   return !pincode_callback_.is_null();
 }
 
 void BluetoothPairingChromeOS::SetPinCode(const std::string& pincode) {
   if (pincode_callback_.is_null())
     return;
 
   pincode_callback_.Run(BluetoothAgentServiceProvider::Delegate::SUCCESS,
                         pincode);
   pincode_callback_.Reset();
 
   // If this is not an outgoing connection to the device, clean up the pairing
   // context since the pairing is done. The outgoing connection case is cleaned
   // up in the callback for the underlying Pair() call.
   if (!device_->IsConnecting())
     device_->EndPairing();
 }
 
 void BluetoothPairingChromeOS::DisplayPinCode(const std::string& pincode) {
   UMA_HISTOGRAM_ENUMERATION("Bluetooth.PairingMethod",
                             UMA_PAIRING_METHOD_DISPLAY_PINCODE,
                             UMA_PAIRING_METHOD_COUNT);
 
+  ResetCallbacks();
+  pairing_delegate_used_ = true;
   pairing_delegate_->DisplayPinCode(device_, pincode);
-  pairing_delegate_used_ = true;
 
   // If this is not an outgoing connection to the device, the pairing context
   // needs to be cleaned up again as there's no reliable indication of
   // completion of incoming pairing.
   if (!device_->IsConnecting())
     device_->EndPairing();
 }
 
 void BluetoothPairingChromeOS::RequestPasskey(
     const BluetoothAgentServiceProvider::Delegate::PasskeyCallback& callback) {
   UMA_HISTOGRAM_ENUMERATION("Bluetooth.PairingMethod",
                             UMA_PAIRING_METHOD_REQUEST_PASSKEY,
                             UMA_PAIRING_METHOD_COUNT);
 
-  DCHECK(passkey_callback_.is_null());
+  ResetCallbacks();
   passkey_callback_ = callback;
+  pairing_delegate_used_ = true;
   pairing_delegate_->RequestPasskey(device_);
-  pairing_delegate_used_ = true;
 }
 
 bool BluetoothPairingChromeOS::ExpectingPasskey() const {
   return !passkey_callback_.is_null();
 }
 
 void BluetoothPairingChromeOS::SetPasskey(uint32 passkey) {
   if (passkey_callback_.is_null())
     return;
 
   passkey_callback_.Run(BluetoothAgentServiceProvider::Delegate::SUCCESS,
                         passkey);
   passkey_callback_.Reset();
 
   // If this is not an outgoing connection to the device, clean up the pairing
   // context since the pairing is done. The outgoing connection case is cleaned
   // up in the callback for the underlying Pair() call.
   if (!device_->IsConnecting())
     device_->EndPairing();
 }
 
 void BluetoothPairingChromeOS::DisplayPasskey(uint32 passkey) {
   UMA_HISTOGRAM_ENUMERATION("Bluetooth.PairingMethod",
                             UMA_PAIRING_METHOD_DISPLAY_PASSKEY,
                             UMA_PAIRING_METHOD_COUNT);
 
+  ResetCallbacks();
+  pairing_delegate_used_ = true;
+  pairing_delegate_->DisplayPasskey(device_, passkey);
 
-  pairing_delegate_->DisplayPasskey(device_, passkey);
+}
+
+void BluetoothPairingChromeOS::KeysEntered(uint16 entered) {
   pairing_delegate_used_ = true;
+  pairing_delegate_->KeysEntered(device_, entered);
 
   // If this is not an outgoing connection to the device, the pairing context
   // needs to be cleaned up again as there's no reliable indication of
   // completion of incoming pairing.
-  if (!device_->IsConnecting())
+  if (entered > 6 && !device_->IsConnecting())

[stevenjb, 2014/02/28 21:40:54]

const for 6

[keybuk, 2014/02/28 22:28:54]

Done.

     device_->EndPairing();
 }
 
-void BluetoothPairingChromeOS::KeysEntered(uint16 entered) {
-  pairing_delegate_->KeysEntered(device_, entered);
-  pairing_delegate_used_ = true;
-}
-
 void BluetoothPairingChromeOS::RequestConfirmation(
     uint32 passkey,
     const BluetoothAgentServiceProvider::Delegate::ConfirmationCallback&
         callback) {
   UMA_HISTOGRAM_ENUMERATION("Bluetooth.PairingMethod",
                             UMA_PAIRING_METHOD_CONFIRM_PASSKEY,
                             UMA_PAIRING_METHOD_COUNT);
 
-  DCHECK(confirmation_callback_.is_null());
+  ResetCallbacks();
   confirmation_callback_ = callback;
+  pairing_delegate_used_ = true;
   pairing_delegate_->ConfirmPasskey(device_, passkey);
-  pairing_delegate_used_ = true;
 }
 
 void BluetoothPairingChromeOS::RequestAuthorization(
     const BluetoothAgentServiceProvider::Delegate::ConfirmationCallback&
         callback) {
   UMA_HISTOGRAM_ENUMERATION("Bluetooth.PairingMethod",
                             UMA_PAIRING_METHOD_NONE,
                             UMA_PAIRING_METHOD_COUNT);
 
-  DCHECK(confirmation_callback_.is_null());
+  ResetCallbacks();
   confirmation_callback_ = callback;
+  pairing_delegate_used_ = true;
   pairing_delegate_->AuthorizePairing(device_);
-  pairing_delegate_used_ = true;
 }
 
 bool BluetoothPairingChromeOS::ExpectingConfirmation() const {
   return !confirmation_callback_.is_null();
 }
 
 void BluetoothPairingChromeOS::ConfirmPairing() {
   if (confirmation_callback_.is_null())
     return;
 
@@ skipping 15 matching lines @@
 bool BluetoothPairingChromeOS::CancelPairing() {
   return RunPairingCallbacks(
       BluetoothAgentServiceProvider::Delegate::CANCELLED);
 }
 
 BluetoothDevice::PairingDelegate*
 BluetoothPairingChromeOS::GetPairingDelegate() const {
   return pairing_delegate_;
 }
 
+void BluetoothPairingChromeOS::ResetCallbacks() {
+  pincode_callback_.Reset();
+  passkey_callback_.Reset();
+  confirmation_callback_.Reset();
+}
+
 bool BluetoothPairingChromeOS::RunPairingCallbacks(
     BluetoothAgentServiceProvider::Delegate::Status status) {
   pairing_delegate_used_ = true;
 
   bool callback_run = false;
   if (!pincode_callback_.is_null()) {
     pincode_callback_.Run(status, "");
     pincode_callback_.Reset();
     callback_run = true;
   }
@@ skipping 13 matching lines @@
   // If this is not an outgoing connection to the device, clean up the pairing
   // context since the pairing is done. The outgoing connection case is cleaned
   // up in the callback for the underlying Pair() call.
   if (!device_->IsConnecting())
     device_->EndPairing();
 
   return callback_run;
 }
 
 }  // namespace chromeos