Replace check() override with update connectionState override

This change will allow GenericConnectionHandler to perform callback
management itslef instead of relying on the inner connection handler
thus making it possible to keep callbacks between inner
connectionHandler change

Author: andreagilardoni

src/GenericConnectionHandler.cpp

@@ -49,9 +49,8 @@ bool GenericConnectionHandler::updateSetting(const models::NetworkSetting& s) {
     }
 }
 
-NetworkConnectionState GenericConnectionHandler::check()
-{
-    return _ch != nullptr ? _ch->check() : NetworkConnectionState::INIT;
+NetworkConnectionState GenericConnectionHandler::updateConnectionState() {
+    return _ch != nullptr ? _ch->updateConnectionState() : NetworkConnectionState::INIT;
 }
 
 NetworkConnectionState GenericConnectionHandler::update_handleInit() {
@@ -103,12 +102,6 @@ void GenericConnectionHandler::disconnect() {
     ConnectionHandler::disconnect();
 }
 
-void GenericConnectionHandler::addCallback(NetworkConnectionEvent const event, OnNetworkEventCallback callback) {
-    if(_ch!=nullptr) {
-        _ch->addCallback(event, callback);
-    }
-}
-
 void GenericConnectionHandler::setKeepAlive(bool keep_alive) {
     _keep_alive = keep_alive;
 

src/GenericConnectionHandler.h

@@ -38,8 +38,8 @@ class GenericConnectionHandler : public ConnectionHandler
 
     GenericConnectionHandler(bool const keep_alive=true): ConnectionHandler(keep_alive), _ch(nullptr) {}
 
-    NetworkConnectionState check() override;
-    
+    // NetworkConnectionState check() override;
+
     #if defined(BOARD_HAS_NOTECARD) || defined(BOARD_HAS_LORA)
       virtual bool available() = 0;
       virtual int read() = 0;
@@ -61,12 +61,13 @@ class GenericConnectionHandler : public ConnectionHandler
 
     void connect() override;
     void disconnect() override;
-    void addCallback(NetworkConnectionEvent const event, OnNetworkEventCallback callback) override;
 
     void setKeepAlive(bool keep_alive=true) override;
 
   protected:
 
+    NetworkConnectionState updateConnectionState() override;
+
     NetworkConnectionState update_handleInit         () override;
     NetworkConnectionState update_handleConnecting   () override;
     NetworkConnectionState update_handleConnected    () override;