[my-place] DatabaseManager usage refactoring.

[platform/core/context/context-provider.git] / src / my-place / facade / UserPlaces.h

diff --git a/src/my-place/facade/UserPlaces.h b/src/my-place/facade/UserPlaces.h
index 2bcf56d..179fc93 100644 (file)
--- a/src/my-place/facade/UserPlaces.h
+++ b/src/my-place/facade/UserPlaces.h
@@ -22,20 +22,18 @@
 #include <string>
 #include <Json.h>
 #include <TimerManager.h>
-#include <DatabaseManager.h>
+#include <ITimerListener.h>
 #include "../visit-detector/VisitDetector.h"
 #include "../place/PlacesDetector.h"
 #include "UserPlacesTypes.h"
 
 namespace ctx {
 
-       class UserPlaces {
+       class UserPlaces : public ITimerListener {
 
        private:
                VisitDetector *__visitDetector;
-               PlacesDetector *__placesDetector;
-               DatabaseManager *__dbManager;
-               int __placesDetectorTimerId;
+               int __timerId;
                TimerManager __timerManager;
                std::vector<Json> __dbGetPlaces();
                std::map<std::string, std::string> __dbGetWifiAPsMap();
@@ -52,6 +50,8 @@ namespace ctx {
                std::vector<std::shared_ptr<Place>> __getPlaces();
                static Json __composeJson(std::vector<std::shared_ptr<Place>> places);
 
+               bool onTimerExpired(int timerId);
+
        public:
                UserPlaces(PlaceRecogMode energyMode = PLACE_RECOG_HIGH_ACCURACY_MODE);
                ~UserPlaces();