From 73e5f2d655921ac8c78ffc2da577b20e41b09d7a Mon Sep 17 00:00:00 2001
From: paul-szczepanek-arm
 <33840200+paul-szczepanek-arm@users.noreply.github.com>
Date: Thu, 18 Jan 2018 14:38:25 +0000
Subject: [PATCH] removed old events that are now only in legacy handling

---
 features/FEATURE_BLE/ble/SecurityManager.h    | 28 ++++---------------
 .../FEATURE_BLE/ble/pal/PalSecurityManager.h  | 10 -------
 .../source/generic/GenericSecurityManager.cpp | 16 -----------
 3 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/features/FEATURE_BLE/ble/SecurityManager.h b/features/FEATURE_BLE/ble/SecurityManager.h
index 351982ad1c..14c3f1c5c2 100644
--- a/features/FEATURE_BLE/ble/SecurityManager.h
+++ b/features/FEATURE_BLE/ble/SecurityManager.h
@@ -131,13 +131,6 @@ public:
         // Security
         //
 
-        virtual void securitySetupInitiated(connection_handle_t handle, bool allowBonding, bool requireMITM, SecurityManager::SecurityIOCapabilities_t iocaps) {
-            (void)handle;
-            (void)allowBonding;
-            (void)requireMITM;
-            (void)iocaps;
-        }
-
         virtual void linkSecured(connection_handle_t handle, SecurityManager::SecurityMode_t securityMode) {
             (void)handle;
             (void)securityMode;
@@ -216,12 +209,6 @@ private:
             }
         }
 
-        void securitySetupInitiated(connection_handle_t handle, bool allowBonding, bool requireMITM, SecurityManager::SecurityIOCapabilities_t iocaps) {
-            if (securitySetupInitiatedCallback) {
-                securitySetupInitiatedCallback(handle, allowBonding, requireMITM, iocaps);
-            }
-        };
-
         ////////////////////////////////////////////////////////////////////////////
         // Security
         //
@@ -232,13 +219,6 @@ private:
             }
         };
 
-        /* TODO: this appears to be redundant */
-        void securityContextStored(connection_handle_t handle) {
-            if (securityContextStoredCallback) {
-                securityContextStoredCallback(handle);
-            }
-        }
-
         ////////////////////////////////////////////////////////////////////////////
         // MITM
         //
@@ -647,7 +627,9 @@ public:
 public:
     /** @deprecated */
     void processSecuritySetupInitiatedEvent(Gap::Handle_t handle, bool allowBonding, bool requireMITM, SecurityIOCapabilities_t iocaps) {
-        eventHandler->securitySetupInitiated(handle, allowBonding, requireMITM, iocaps);
+        if (defaultEventHandler.securitySetupInitiatedCallback) {
+            defaultEventHandler.securitySetupInitiatedCallback(handle, allowBonding, requireMITM, iocaps);
+        }
     }
     /** @deprecated */
     void processSecuritySetupCompletedEvent(Gap::Handle_t handle, SecurityCompletionStatus_t status) {
@@ -666,7 +648,9 @@ public:
     }
     /** @deprecated */
     void processSecurityContextStoredEvent(Gap::Handle_t handle) {
-        eventHandler->securityContextStored(handle);
+        if (defaultEventHandler.securityContextStoredCallback) {
+            defaultEventHandler.securityContextStoredCallback(handle);
+        }
     }
     /** @deprecated */
     void processPasskeyDisplayEvent(Gap::Handle_t handle, const Passkey_t passkey) {
diff --git a/features/FEATURE_BLE/ble/pal/PalSecurityManager.h b/features/FEATURE_BLE/ble/pal/PalSecurityManager.h
index 51e116d29f..9678db6e4e 100644
--- a/features/FEATURE_BLE/ble/pal/PalSecurityManager.h
+++ b/features/FEATURE_BLE/ble/pal/PalSecurityManager.h
@@ -233,16 +233,6 @@ public:
     // Security
     //
 
-    /**
-     * To indicate that a security procedure for the link has started.
-     */ /*TODO: is this redundant with pairing request present? */
-    virtual void on_security_setup_initiated(
-        connection_handle_t connection,
-        bool allow_bonding,
-        bool require_mitm,
-        io_capability_t iocaps
-    ) = 0;
-
     /**
      * To indicate that the link with the peer is secured. For bonded devices,
      * subsequent reconnections with a bonded peer will result only in this callback
diff --git a/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp b/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
index 6006d26f8e..cfe9be9efd 100644
--- a/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
+++ b/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
@@ -525,15 +525,6 @@ public:
     // Security
     //
 
-    void on_security_setup_initiated(connection_handle_t connection,
-                                     bool allow_bonding,
-                                     bool require_mitm,
-                                     io_capability_t iocaps) {
-        if (_app_event_handler) {
-            _app_event_handler->securitySetupInitiated(connection, allow_bonding, require_mitm, iocaps);
-        }
-    }
-
     void on_link_secured(connection_handle_t connection,
                          SecurityManager::SecurityMode_t security_mode) {
         if (_app_event_handler) {
@@ -547,13 +538,6 @@ public:
         }
     }
 
-    /* TODO: this appears to be redundant */
-    void on_security_context_stored(connection_handle_t connection) {
-        if (_app_event_handler) {
-            _app_event_handler->securityContextStored(connection);
-        }
-    }
-
     ////////////////////////////////////////////////////////////////////////////
     // MITM
     //