Internal encryption: Fix missing elm config files and locales

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: I388a157036d71014924773db9c5b98a3286ac2e3

diff --git a/server/internal-encryption.cpp b/server/internal-encryption.cpp
index 4dbcf13..6a8a90a 100644 (file)
--- a/server/internal-encryption.cpp
+++ b/server/internal-encryption.cpp
@@ -21,6 +21,7 @@
 #include <sys/reboot.h>
 
 #include <vconf.h>
+#include <tzplatform_config.h>
 #include <klay/process.h>
 #include <klay/file-user.h>
 #include <klay/filesystem.h>
@@ -91,6 +92,27 @@ void stopDependedSystemdServices()
 }
 
 void showProgressUI(const std::string type) {
+       ::tzplatform_set_user(::tzplatform_getuid(TZ_SYS_DEFAULT_USER));
+       std::string defaultUserHome(::tzplatform_getenv(TZ_USER_HOME));
+       ::tzplatform_reset_user();
+
+       ::tzplatform_set_user(::getuid());
+       std::string currentUserHome(::tzplatform_getenv(TZ_USER_HOME));
+       ::tzplatform_reset_user();
+
+       INFO("Home directory : " + currentUserHome);
+
+       runtime::File shareDirectory(currentUserHome + "/share");
+       if (!shareDirectory.exists()) {
+               shareDirectory.makeDirectory();
+       }
+
+       runtime::File elmConfigDir(currentUserHome + "/share/.elementary");
+       if (!elmConfigDir.exists()) {
+               runtime::File defaultElmConfigDir(defaultUserHome + "/share/.elementary");
+               defaultElmConfigDir.copyTo(shareDirectory.getPath());
+       }
+
        std::vector<std::string> args = {
                "ode", "progress", type, "Internal"
        };

diff --git a/server/systemd/ode.service.in b/server/systemd/ode.service.in
index d9320ff..2080c19 100644 (file)
--- a/server/systemd/ode.service.in
+++ b/server/systemd/ode.service.in
@@ -10,7 +10,6 @@ Restart=on-failure
 ExecReload=/bin/kill -HUP $MAINPID
 CapabilityBoundingSet=~CAP_MAC_ADMIN
 CapabilityBoundingSet=~CAP_MAC_OVERRIDE
-CapabilityBoundingSet=~CAP_DAC_OVERRIDE
 EnvironmentFile=/run/tizen-system-env
 EnvironmentFile=/run/xdg-root-env
 

diff --git a/tools/apps/ode/src/ode-app.c b/tools/apps/ode/src/ode-app.c
index 263b4d0..7beebe9 100755 (executable)
--- a/tools/apps/ode/src/ode-app.c
+++ b/tools/apps/ode/src/ode-app.c
@@ -270,8 +270,14 @@ int standalone_main(int argc, char *argv[])
                return EXIT_FAILURE;
        }
 
+       char *lang = vconf_get_str(VCONFKEY_LANGSET);
+       setlocale(LC_ALL, lang);
+       if (lang) {
+               free(lang);
+       }
+       bindtextdomain("ode", "/usr/apps/org.tizen.ode/res/locale");
+
        elm_init(argc, argv);
-       ui_app_lang_changed(NULL, NULL);
        create_base_window();
 
        if (!strncmp(argv[1], "progress", sizeof("progress"))) {