Change sensor-recorder as system service & version 4.0.1

Change-Id: Ib21da8b598081b4bbcef86bb55847875c7f66f5a
Signed-off-by: Somin Kim <somin926.kim@samsung.com>

diff --git a/include/private/SensorRecorderService.h b/include/private/SensorRecorderService.h
index aff866f..086605f 100644 (file)
--- a/include/private/SensorRecorderService.h
+++ b/include/private/SensorRecorderService.h
@@ -19,14 +19,14 @@
 
 /* This header SHOULD NOT be included by other headers in this directory. */
 
-#include <IUserService.h>
+#include <ISystemService.h>
 #include <IServiceRunner.h>
 #include <IClient.h>
 #include <IMethodCallHandler.h>
 
 namespace ctx {
 
-       class EXPORT_API SensorRecorderService : public IUserService {
+       class EXPORT_API SensorRecorderService : public ISystemService {
        public:
                SensorRecorderService();
                ~SensorRecorderService();
@@ -37,9 +37,11 @@ namespace ctx {
                const char* getMethodSpecs();
                IMethodCallHandler* createMethodCallHandler(IClient* client);
 
-               // Inherited from IUserService
-               bool prepare(uid_t uid);
-               void cleanup(uid_t uid);
+               // Inherited from ISystemService
+               bool prepare();
+               void cleanup();
+               void onUserActivated(uid_t uid);
+               void onUserDeactivated(uid_t uid);
 
                // Own members
                GDBusConnection* getConnection();

diff --git a/packaging/context-sensor-recorder.spec b/packaging/context-sensor-recorder.spec
index 45f1913..42b8b81 100644 (file)
--- a/packaging/context-sensor-recorder.spec
+++ b/packaging/context-sensor-recorder.spec
@@ -1,6 +1,6 @@
 Name:       context-sensor-recorder
 Summary:    Sensor recorder service server and client libraries
-Version:    4.0.0
+Version:    4.0.1
 Release:    1
 Group:      Service Framework/Context
 License:    Apache-2.0

diff --git a/src/server-dummy/SensorRecorderService.cpp b/src/server-dummy/SensorRecorderService.cpp
index b5052a4..36eb955 100644 (file)
--- a/src/server-dummy/SensorRecorderService.cpp
+++ b/src/server-dummy/SensorRecorderService.cpp
@@ -49,12 +49,20 @@ IMethodCallHandler* SensorRecorderService::createMethodCallHandler(IClient* clie
        return NULL;
 }
 
-bool SensorRecorderService::prepare(uid_t uid)
+bool SensorRecorderService::prepare()
 {
        return false;
 }
 
-void SensorRecorderService::cleanup(uid_t uid)
+void SensorRecorderService::cleanup()
+{
+}
+
+void SensorRecorderService::onUserActivated(uid_t uid)
+{
+}
+
+void SensorRecorderService::onUserDeactivated(uid_t uid)
 {
 }
 

diff --git a/src/server/SensorDatabase.cpp b/src/server/SensorDatabase.cpp
index b08ce19..08787e7 100644 (file)
--- a/src/server/SensorDatabase.cpp
+++ b/src/server/SensorDatabase.cpp
@@ -19,57 +19,54 @@
 
 using namespace ctx;
 
-Database* SensorDatabase::__userDatabase = NULL;
+Database* SensorDatabase::__database = NULL;
 
 SensorDatabase::SensorDatabase()
 {
 }
 
-bool SensorDatabase::open(uid_t uid)
+bool SensorDatabase::open()
 {
-       if (isReady()) {
-               _W("Closing the current DB");
-               close();
-       }
+       IF_FAIL_RETURN(!isReady(), true);
 
-       __userDatabase = new PlatformDatabase(BASE_PATH, uid);
+       __database = new PlatformDatabase(BASE_PATH);
 
-       if (!__userDatabase->open()) {
+       if (!__database->open()) {
                _E("DB open failed");
-               delete __userDatabase;
-               __userDatabase = NULL;
+               delete __database;
+               __database = NULL;
                return false;
        }
 
-       _I("User DB opened");
+       _I("System DB opened");
        return true;
 }
 
 void SensorDatabase::close()
 {
-       if (!__userDatabase)
+       if (!__database)
                return;
 
-       __userDatabase->close();
-       _I("User DB closed");
+       __database->close();
+       _I("System DB closed");
 
-       delete __userDatabase;
-       __userDatabase = NULL;
+       delete __database;
+       __database = NULL;
 }
 
 bool SensorDatabase::isReady()
 {
-       return (__userDatabase != NULL);
+       return (__database != NULL);
 }
 
 bool SensorDatabase::execute(const std::string& query, const std::string& columnTypes, std::vector<std::string>* columnNames, std::vector<std::shared_ptr<Tuple>>* queryResult)
 {
        IF_FAIL_RETURN_TAG(isReady(), false, _W, "DB not ready");
-       return __userDatabase->execute(query, columnTypes, columnNames, queryResult);
+       return __database->execute(query, columnTypes, columnNames, queryResult);
 }
 
 bool SensorDatabase::execute(const std::string& query, std::vector<std::shared_ptr<Tuple>>* queryResult)
 {
        IF_FAIL_RETURN_TAG(isReady(), false, _W, "DB not ready");
-       return __userDatabase->execute(query, queryResult);
+       return __database->execute(query, queryResult);
 }

diff --git a/src/server/SensorDatabase.h b/src/server/SensorDatabase.h
index a61375c..a82235e 100644 (file)
--- a/src/server/SensorDatabase.h
+++ b/src/server/SensorDatabase.h
@@ -24,7 +24,7 @@ namespace ctx {
 
        class SensorDatabase {
        public:
-               static bool open(uid_t uid);
+               static bool open();
                static void close();
                static bool isReady();
                static bool execute(const std::string& query, const std::string& columnTypes, std::vector<std::string>* columnNames, std::vector<std::shared_ptr<Tuple>>* queryResult);
@@ -33,7 +33,7 @@ namespace ctx {
        private:
                SensorDatabase();
 
-               static Database* __userDatabase;
+               static Database* __database;
        };
 
 }

diff --git a/src/server/SensorRecorderService.cpp b/src/server/SensorRecorderService.cpp
index 0b62991..a50eb34 100644 (file)
--- a/src/server/SensorRecorderService.cpp
+++ b/src/server/SensorRecorderService.cpp
@@ -53,11 +53,11 @@ IMethodCallHandler* SensorRecorderService::createMethodCallHandler(IClient* clie
        return new MethodCallHandler(client);
 }
 
-bool SensorRecorderService::prepare(uid_t uid)
+bool SensorRecorderService::prepare()
 {
        RecorderClientInfo::setHostService(this);
 
-       if (!SensorDatabase::open(uid))
+       if (!SensorDatabase::open())
                return false;
 
        SensorTimer::init();
@@ -66,13 +66,21 @@ bool SensorRecorderService::prepare(uid_t uid)
        return true;
 }
 
-void SensorRecorderService::cleanup(uid_t uid)
+void SensorRecorderService::cleanup()
 {
        SensorProvider::release();
        SensorTimer::release();
        SensorDatabase::close();
 }
 
+void SensorRecorderService::onUserActivated(uid_t uid)
+{
+}
+
+void SensorRecorderService::onUserDeactivated(uid_t uid)
+{
+}
+
 GDBusConnection* SensorRecorderService::getConnection()
 {
        return __serviceRunner->getConnection();

diff --git a/src/server/legacy/SensorProvider.cpp b/src/server/legacy/SensorProvider.cpp
index a31a050..f62160a 100644 (file)
--- a/src/server/legacy/SensorProvider.cpp
+++ b/src/server/legacy/SensorProvider.cpp
@@ -90,6 +90,7 @@ bool SensorProvider::getSystemInfo(const char* key)
        bool supported = false;
        int ret = system_info_get_platform_bool(key, &supported);
        IF_FAIL_RETURN_TAG(ret == SYSTEM_INFO_ERROR_NONE, false, _E, "system_info_get_platform_bool() failed");
+
        return supported;
 }