Index: sources/ApplicationController.cpp =================================================================== diff -u -r1da89b0452b8ef9448847618e75c118f3f58bd0c -r114e1def79a9c9d469c531b33f4514550ff113e7 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 114e1def79a9c9d469c531b33f4514550ff113e7) @@ -29,7 +29,6 @@ #include "WifiInterface.h" #include "BluetoothInterface.h" #include "VAdjustmentVersions.h" -#include "encryption.h" /*! * \brief ApplicationController::ApplicationController @@ -316,12 +315,6 @@ } // disabled coco end -void ApplicationController::onCryptSetupMount(bool /*vPass*/) -{ - // if ( vPass ) - initSettings(); -} - /*! * \brief ApplicationController::onExportLog * \details the slot which will be called by UI to so the log export. @@ -548,15 +541,17 @@ { onActionReceive(SettingsData()); + /// POST /// // call initialization functions when setting's ready. _Settings.datetimeFormat(); + emit didSettingsDone( ); // MessageDispatcher -> MessageInterpreter : updateUnhandledMessages + emit didPOSTPass (_post.isDone( )); // GuiController -> GuiView : didPOSTPass(bool) - emit didSettingsDone(); - - emit didPOSTPass(_post.isDone()); - - /// POST /// - keepAlive(); + // HD POST request + postDoneRequest ( ); + versionsRequest (_post.isDone( )); + // UI is done, let's keep in touch + emit didKeepAliveBegin(); } /*! @@ -605,7 +600,7 @@ void ApplicationController::onPOSTCloudSync(bool vPass) { emit didPOSTCloudSync(vPass); - emit didPOSTBluetooth("000:000:000:000" /*_post.netCloudSync*/); // not needed and post is not getting it yet. + emit didPOSTBluetooth("000.000.000.000" /*_post.netCloudSync*/); // not needed and post is not getting it yet. } /*! @@ -627,8 +622,6 @@ /// in manufacturing mode the configurations must reside in /root/home /// therefore the settings can be initialized after POST. if ( gEnableManufacturing ) initSettings(); - /// POST /// postDoneRequest(); - /// POST /// versionsRequest(vPass); } /*! @@ -657,3 +650,9 @@ LOG_DEBUG("ApplicationPost Start"); _post.start(); } + +void ApplicationController::onCryptSetupMount(bool /*vPass*/) +{ + // if ( vPass ) // in needs more investigation + initSettings(); +} Index: sources/MainTimer.cpp =================================================================== diff -u -r1da89b0452b8ef9448847618e75c118f3f58bd0c -r114e1def79a9c9d469c531b33f4514550ff113e7 --- sources/MainTimer.cpp (.../MainTimer.cpp) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) +++ sources/MainTimer.cpp (.../MainTimer.cpp) (revision 114e1def79a9c9d469c531b33f4514550ff113e7) @@ -137,7 +137,7 @@ void MainTimer::timerEvent(QTimerEvent *) { #ifndef DISABLE_KEEP_ALIVE - ////POST//// emit didTimeout(); + emit didTimeout(); #endif // I'm not sure how often we need to check for this. // if it needs to be checked each second pass true Index: sources/utility/encryption.cpp =================================================================== diff -u -r389f028cb9d4d320eae393de7c4408a58a619356 -r114e1def79a9c9d469c531b33f4514550ff113e7 --- sources/utility/encryption.cpp (.../encryption.cpp) (revision 389f028cb9d4d320eae393de7c4408a58a619356) +++ sources/utility/encryption.cpp (.../encryption.cpp) (revision 114e1def79a9c9d469c531b33f4514550ff113e7) @@ -151,6 +151,6 @@ 77, 50, 52, 119, 0 }; QString hashed = hashedString(QString(c), ok, true); - //DEBUG qDebug() << __FUNCTION__ << hashed; + //DEBUG qDebug() << __FUNCTION__ << hashed << ok; return hashed; }