Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87d879fd authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge "ISecurityManagerListener: use AddressWithType"

parents f0012463 2f60ae69

system/gd/security/internal/security_manager_impl.cc

+3 −3
Original line number Diff line number Diff line
@@ -121,20 +121,20 @@ void SecurityManagerImpl::UnregisterCallbackListener(ISecurityManagerListener* l 
  LOG_ALWAYS_FATAL("Listener has not been registered!");

}



void SecurityManagerImpl::NotifyDeviceBonded(std::shared_ptr<Device> device) {

void SecurityManagerImpl::NotifyDeviceBonded(hci::AddressWithType device) {

  for (auto& iter : listeners_) {

    iter.second->Post(common::Bind(&ISecurityManagerListener::OnDeviceBonded, common::Unretained(iter.first), device));

  }

}



void SecurityManagerImpl::NotifyDeviceBondFailed(std::shared_ptr<Device> device) {

void SecurityManagerImpl::NotifyDeviceBondFailed(hci::AddressWithType device) {

  for (auto& iter : listeners_) {

    iter.second->Post(

        common::Bind(&ISecurityManagerListener::OnDeviceBondFailed, common::Unretained(iter.first), device));

  }

}



void SecurityManagerImpl::NotifyDeviceUnbonded(std::shared_ptr<Device> device) {

void SecurityManagerImpl::NotifyDeviceUnbonded(hci::AddressWithType device) {

  for (auto& iter : listeners_) {

    iter.second->Post(

        common::Bind(&ISecurityManagerListener::OnDeviceUnbonded, common::Unretained(iter.first), device));

system/gd/security/internal/security_manager_impl.h

+3 −3
Original line number Diff line number Diff line
@@ -93,9 +93,9 @@ class SecurityManagerImpl /*: public channel::ISecurityManagerChannelListener*/ 


 protected:

  std::vector<std::pair<ISecurityManagerListener*, os::Handler*>> listeners_;

  void NotifyDeviceBonded(std::shared_ptr<bluetooth::hci::Device> device);

  void NotifyDeviceBondFailed(std::shared_ptr<bluetooth::hci::Device> device);

  void NotifyDeviceUnbonded(std::shared_ptr<bluetooth::hci::Device> device);

  void NotifyDeviceBonded(hci::AddressWithType device);

  void NotifyDeviceBondFailed(hci::AddressWithType device);

  void NotifyDeviceUnbonded(hci::AddressWithType device);



  // ISecurityManagerChannel

  void OnChangeConnectionLinkKeyComplete(std::shared_ptr<hci::Device> device,

system/gd/security/security_manager.h

+7 −7
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#include <memory>

#include <vector>



#include "hci/address_with_type.h"

#include "hci/device.h"

#include "hci/device_database.h"

#include "security/internal/security_manager_impl.h"



namespace bluetooth {
@@ -38,23 +38,23 @@ class ISecurityManagerListener { 
  /**

   * Called when a device is successfully bonded.

   *

   * @param device pointer to the bonded device

   * @param address of the newly bonded device

   */

  virtual void OnDeviceBonded(std::shared_ptr<bluetooth::hci::Device> device) = 0;

  virtual void OnDeviceBonded(bluetooth::hci::AddressWithType device) = 0;



  /**

   * Called when a device is successfully un-bonded.

   *

   * @param device pointer to the device that is no longer bonded

   * @param address of device that is no longer bonded

   */

  virtual void OnDeviceUnbonded(std::shared_ptr<bluetooth::hci::Device> device) = 0;

  virtual void OnDeviceUnbonded(bluetooth::hci::AddressWithType device) = 0;



  /**

   * Called as a result of a failure during the bonding process.

   *

   * @param device pointer to the device that is no longer bonded

   * @param address of the device that failed to bond

   */

  virtual void OnDeviceBondFailed(std::shared_ptr<bluetooth::hci::Device> device) = 0;

  virtual void OnDeviceBondFailed(bluetooth::hci::AddressWithType device) = 0;

};



/**